diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 76fb19529b0..17b830e5fad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,7 +12,7 @@
# Libraries
/lib @edolstra @nbp
-/lib/systems @nbp @ericson2314
+/lib/systems @nbp @ericson2314 @matthewbauer
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch
@@ -20,9 +20,11 @@
/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/generic @Ericson2314
-/pkgs/stdenv/cross @Ericson2314
+/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
+/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
+/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
+/pkgs/stdenv/generic @Ericson2314 @matthewbauer
+/pkgs/stdenv/cross @Ericson2314 @matthewbauer
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
@@ -74,6 +76,14 @@
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
+# C compilers
+/pkgs/development/compilers/gcc @matthewbauer
+/pkgs/development/compilers/llvm @matthewbauer
+
+# Compatibility stuff
+/pkgs/top-level/unix-tools.nix @matthewbauer
+/pkgs/development/tools/xcbuild @matthewbauer
+
# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
@@ -97,3 +107,13 @@
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel
+
+# PostgreSQL and related stuff
+/pkgs/servers/sql/postgresql @thoughtpolice
+/nixos/modules/services/databases/postgresql.xml @thoughtpolice
+/nixos/modules/services/databases/postgresql.nix @thoughtpolice
+/nixos/tests/postgresql.nix @thoughtpolice
+
+# Dhall
+/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
+/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index b3f7f093835..3e8a0ea4a70 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -842,9 +842,12 @@ src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
+ sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
}
+ Find the value to put as sha256 by running
+ nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix
+ or nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz.
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 99e2a63631a..1bd90d2a0c7 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -6,8 +6,14 @@
Sometimes one wants to override parts of nixpkgs, e.g.
- derivation attributes, the results of derivations or even the whole package
- set.
+ derivation attributes, the results of derivations.
+
+
+
+ These functions are used to make changes to packages, returning only single
+ packages. Overlays, on the other
+ hand, can be used to combine the overridden packages across the entire
+ package set of Nixpkgs.
@@ -25,6 +31,9 @@
Example usages:
pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
+
import pkgs.path { overlays = [ (self: super: {
foo = super.foo.override { barSupport = true ; };
@@ -86,11 +95,11 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
in this case, as it overrides only the attributes of the final derivation.
It is for this reason that overrideAttrs should be
preferred in (almost) all cases to overrideDerivation,
- i.e. to allow using sdenv.mkDerivation to process input
+ i.e. to allow using stdenv.mkDerivation to process input
arguments, as well as the fact that it is easier to use (you can use the
same attribute names you see in your Nix code, instead of the ones
generated (e.g. buildInputs vs
- nativeBuildInputs, and involves less typing.
+ nativeBuildInputs), and it involves less typing).
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index 640b04c7da9..4314df5c9df 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -12,8 +12,8 @@
Some extensions (plugins) might require OCaml and sometimes other OCaml
- packages. The coq.ocamlPackages attribute can be used
- to depend on the same package set Coq was built against.
+ packages. The coq.ocamlPackages attribute can be used to
+ depend on the same package set Coq was built against.
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index b52b79c62d9..907f4d9152a 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -483,8 +483,8 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
-Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
-respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
+Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
+respectively `python27`, `python35` and `python36`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
@@ -507,7 +507,7 @@ Each interpreter has the following attributes:
- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, e.g. `python3.4`.
+- `executable`. Name of the interpreter executable, e.g. `python3.7`.
- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
### Building packages and applications
@@ -529,7 +529,6 @@ attribute set is created for each available Python interpreter. The available
sets are
* `pkgs.python27Packages`
-* `pkgs.python34Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
* `pkgs.python37Packages`
@@ -670,7 +669,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
};
- propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
+ propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
meta = with lib; {
...
@@ -837,7 +836,7 @@ community to help save time. No tool is preferred at the moment.
### Deterministic builds
-Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+The Python interpreters are now built deterministically.
Minor modifications had to be made to the interpreters in order to generate
deterministic bytecode. This has security implications and is relevant for
those using Python in a `nix-shell`.
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1b235dbb52f..2cec1543a24 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code:
```
vim_configurable.customize {
+ # `name` specifies the name of the executable and package
name = "vim-with-plugins";
vimrcConfig.customRC = ''
@@ -31,6 +32,8 @@ vim_configurable.customize {
}
```
+This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`.
+
For Neovim the `configure` argument can be overridden to achieve the same:
```
@@ -83,6 +86,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
{
packageOverrides = pkgs: with pkgs; {
myVim = vim_configurable.customize {
+ # `name` specifies the name of the executable and package
name = "vim-with-plugins";
# add here code from the example section
};
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 2decf9febe8..90dd163072d 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -17,91 +17,122 @@
Installing overlays
- The list of overlays is determined as follows.
+ The list of overlays can be set either explicitly in a Nix expression, or
+ through <nixpkgs-overlays> or user configuration
+ files.
-
- If the overlays argument is not provided explicitly, we
- look for overlays in a path. The path is determined as follows:
-
-
-
- First, if an overlays argument to the nixpkgs function
- itself is given, then that is used.
-
-
- This can be passed explicitly when importing nipxkgs, for example
- import <nixpkgs> { overlays = [ overlay1 overlay2 ];
- }.
-
-
-
-
- Otherwise, if the Nix path entry <nixpkgs-overlays>
- exists, we look for overlays at that path, as described below.
-
-
- See the section on NIX_PATH in the Nix manual for more
- details on how to set a value for
- <nixpkgs-overlays>.
-
-
-
-
- If one of ~/.config/nixpkgs/overlays.nix and
- ~/.config/nixpkgs/overlays/ exists, then we look for
- overlays at that path, as described below. It is an error if both exist.
-
-
-
-
+
+ Set overlays in NixOS or Nix expressions
-
- If we are looking for overlays at a path, then there are two cases:
-
-
-
- If the path is a file, then the file is imported as a Nix expression and
- used as the list of overlays.
-
-
-
-
- If the path is a directory, then we take the content of the directory,
- order it lexicographically, and attempt to interpret each as an overlay
- by:
-
-
-
- Importing the file, if it is a .nix file.
-
-
-
-
- Importing a top-level default.nix file, if it is
- a directory.
-
-
-
-
-
-
-
+
+ On a NixOS system the value of the nixpkgs.overlays
+ option, if present, is passed to the system Nixpkgs directly as an
+ argument. Note that this does not affect the overlays for non-NixOS
+ operations (e.g. nix-env), which are
+ looked up independently.
+
-
- On a NixOS system the value of the nixpkgs.overlays
- option, if present, is passed to the system Nixpkgs directly as an argument.
- Note that this does not affect the overlays for non-NixOS operations (e.g.
- nix-env), which are looked up independently.
-
+
+ The list of overlays can be passed explicitly when importing nixpkgs, for
+ example import <nixpkgs> { overlays = [ overlay1 overlay2 ];
+ }.
+
-
- The overlays.nix option therefore provides a convenient
- way to use the same overlays for a NixOS system configuration and user
- configuration: the same file can be used as
- overlays.nix and imported as the value of
- nixpkgs.overlays.
-
+
+ Further overlays can be added by calling the pkgs.extend
+ or pkgs.appendOverlays, although it is often preferable
+ to avoid these functions, because they recompute the Nixpkgs fixpoint,
+ which is somewhat expensive to do.
+
+
+
+
+ Install overlays via configuration lookup
+
+
+ The list of overlays is determined as follows.
+
+
+
+
+
+
+ First, if an
+ overlays
+ argument to the nixpkgs function itself is given, then that is
+ used and no path lookup will be performed.
+
+
+
+
+ Otherwise, if the Nix path entry
+ <nixpkgs-overlays> exists, we look for overlays at
+ that path, as described below.
+
+
+ See the section on NIX_PATH in the Nix manual for
+ more details on how to set a value for
+ <nixpkgs-overlays>.
+
+
+
+
+ If one of ~/.config/nixpkgs/overlays.nix and
+ ~/.config/nixpkgs/overlays/ exists, then we look
+ for overlays at that path, as described below. It is an error if both
+ exist.
+
+
+
+
+
+
+ If we are looking for overlays at a path, then there are two cases:
+
+
+
+ If the path is a file, then the file is imported as a Nix expression and
+ used as the list of overlays.
+
+
+
+
+ If the path is a directory, then we take the content of the directory,
+ order it lexicographically, and attempt to interpret each as an overlay
+ by:
+
+
+
+ Importing the file, if it is a .nix file.
+
+
+
+
+ Importing a top-level default.nix file, if it is
+ a directory.
+
+
+
+
+
+
+
+
+
+ Because overlays that are set in NixOS configuration do not affect
+ non-NixOS operations such as nix-env, the
+ overlays.nix option provides a convenient way to use
+ the same overlays for a NixOS system configuration and user configuration:
+ the same file can be used as overlays.nix and imported
+ as the value of nixpkgs.overlays.
+
+
+
+
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index dad28d3ec8b..49f94f3bd5d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -681,10 +681,10 @@ overrides = self: super: rec {
- The python plugin allows the addition of extra libraries. For instance, the
- inotify.py script in weechat-scripts requires D-Bus or
- libnotify, and the fish.py script requires pycrypto. To
- use these scripts, use the python plugin's
+ The python and perl plugins allows the addition of extra libraries. For
+ instance, the inotify.py script in weechat-scripts
+ requires D-Bus or libnotify, and the fish.py script
+ requires pycrypto. To use these scripts, use the plugin's
withPackages attribute:
weechat.override { configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index cc0c13c5447..b2f30bf08db 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -372,7 +372,7 @@ let f(h, h + 1, i) = i + h
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
+ put it in nativeBuildInputs instead. 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.
@@ -2099,13 +2099,13 @@ someVar=$(stripHash $name)
- 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.
+ 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.
@@ -2445,6 +2445,28 @@ addEnvHooks "$hostOffset" myBashFunction
+
+
+ breakpointHook
+
+
+
+ This hook will make a build pause instead of stopping when a failure
+ happen. It prevents nix to cleanup the build environment immediatly and
+ allows the user to attach to a build environment using the
+ cntr command. On build error it will print the
+ instruction that are neccessary for cntr. Installing
+ cntr and running the command will provide shell access to the build
+ sandbox of failed build. At /var/lib/cntr the
+ sandbox filesystem is mounted. All commands and files of the system are
+ still accessible within the shell. To execute commands from the sandbox
+ use the cntr exec subcommand. Note that cntr also
+ needs to be executed on the machine that is doing the build, which might
+ be not the case when remote builders are enabled.
+ cntr is only supported on linux based platforms.
+
+
+
diff --git a/lib/debug.nix b/lib/debug.nix
index 383eb32d75d..2879f72ed2b 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -23,27 +23,54 @@ rec {
# -- TRACING --
- /* Trace msg, but only if pred is true.
+ /* Conditionally trace the supplied message, based on a predicate.
+
+ Type: traceIf :: bool -> string -> a -> a
Example:
traceIf true "hello" 3
trace: hello
=> 3
*/
- traceIf = pred: msg: x: if pred then trace msg x else x;
+ traceIf =
+ # Predicate to check
+ pred:
+ # Message that should be traced
+ msg:
+ # Value to return
+ x: if pred then trace msg x else x;
- /* Trace the value and also return it.
+ /* Trace the supplied value after applying a function to it, and
+ return the original value.
+
+ Type: traceValFn :: (a -> b) -> a -> a
Example:
traceValFn (v: "mystring ${v}") "foo"
trace: mystring foo
=> "foo"
*/
- traceValFn = f: x: trace (f x) x;
+ traceValFn =
+ # Function to apply
+ f:
+ # Value to trace and return
+ x: trace (f x) x;
+
+ /* Trace the supplied value and return it.
+
+ Type: traceVal :: a -> a
+
+ Example:
+ traceVal 42
+ # trace: 42
+ => 42
+ */
traceVal = traceValFn id;
/* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
+ Type: traceSeq :: a -> b -> b
+
Example:
trace { a.b.c = 3; } null
trace: { a = ; }
@@ -52,7 +79,11 @@ rec {
trace: { a = { b = { c = 3; }; }; }
=> null
*/
- traceSeq = x: y: trace (builtins.deepSeq x x) y;
+ traceSeq =
+ # The value to trace
+ x:
+ # The value to return
+ y: trace (builtins.deepSeq x x) y;
/* Like `traceSeq`, but only evaluate down to depth n.
This is very useful because lots of `traceSeq` usages
@@ -76,27 +107,49 @@ rec {
in trace (generators.toPretty { allowPrettyValues = true; }
(modify depth snip x)) y;
- /* A combination of `traceVal` and `traceSeq` */
- traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v);
+ /* A combination of `traceVal` and `traceSeq` that applies a
+ provided function to the value to be traced after `deepSeq`ing
+ it.
+ */
+ traceValSeqFn =
+ # Function to apply
+ f:
+ # Value to trace
+ v: traceValFn f (builtins.deepSeq v v);
+
+ /* A combination of `traceVal` and `traceSeq`. */
traceValSeq = traceValSeqFn id;
+ /* A combination of `traceVal` and `traceSeqN` that applies a
+ provided function to the value to be traced. */
+ traceValSeqNFn =
+ # Function to apply
+ f:
+ depth:
+ # Value to trace
+ v: traceSeqN depth (f v) v;
+
/* A combination of `traceVal` and `traceSeqN`. */
- traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
traceValSeqN = traceValSeqNFn id;
# -- TESTING --
- /* Evaluate a set of tests. A test is an attribute set {expr,
- expected}, denoting an expression and its expected result. The
- result is a list of failed tests, each represented as {name,
- expected, actual}, denoting the attribute name of the failing
- test and its expected and actual results. Used for regression
- testing of the functions in lib; see tests.nix for an example.
- Only tests having names starting with "test" are run.
- Add attr { tests = ["testName"]; } to run these test only
+ /* Evaluate a set of tests. A test is an attribute set `{expr,
+ expected}`, denoting an expression and its expected result. The
+ result is a list of failed tests, each represented as `{name,
+ expected, actual}`, denoting the attribute name of the failing
+ test and its expected and actual results.
+
+ Used for regression testing of the functions in lib; see
+ tests.nix for an example. Only tests having names starting with
+ "test" are run.
+
+ Add attr { tests = ["testName"]; } to run these tests only.
*/
- runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
+ runTests =
+ # Tests to run
+ tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
let testsToRun = if tests ? tests then tests.tests else [];
in if (substring 0 4 name == "test" || elem name testsToRun)
&& ((testsToRun == []) || elem name tests.tests)
@@ -105,8 +158,11 @@ rec {
then [ { inherit name; expected = test.expected; result = test.expr; } ]
else [] ) tests));
- # create a test assuming that list elements are true
- # usage: { testX = allTrue [ true ]; }
+ /* Create a test assuming that list elements are `true`.
+
+ Example:
+ { testX = allTrue [ true ]; }
+ */
testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 611e6ddb35b..092cbbbdb25 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "GNU General Public License v2.0 only";
};
+ gpl2Classpath = {
+ spdxId = "GPL-2.0-with-classpath-exception";
+ fullName = "GNU General Public License v2.0 only (with Classpath exception)";
+ url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
+ };
+
gpl2ClasspathPlus = {
fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
@@ -394,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
+ jasper = spdx {
+ spdxId = "JasPer-2.0";
+ fullName = "JasPer License";
+ };
lgpl2 = spdx {
spdxId = "LGPL-2.0";
diff --git a/lib/lists.nix b/lib/lists.nix
index 9ecd8f22003..be541427c24 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1,4 +1,5 @@
# General list operations.
+
{ lib }:
with lib.trivial;
let
@@ -8,21 +9,23 @@ rec {
inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
- /* Create a list consisting of a single element. `singleton x' is
- sometimes more convenient with respect to indentation than `[x]'
+ /* Create a list consisting of a single element. `singleton x` is
+ sometimes more convenient with respect to indentation than `[x]`
when x spans multiple lines.
+ Type: singleton :: a -> [a]
+
Example:
singleton "foo"
=> [ "foo" ]
*/
singleton = x: [x];
- /* “right fold” a binary function `op' between successive elements of
- `list' with `nul' as the starting value, i.e.,
- `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
- Type:
- foldr :: (a -> b -> b) -> b -> [a] -> b
+ /* “right fold” a binary function `op` between successive elements of
+ `list` with `nul' as the starting value, i.e.,
+ `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`.
+
+ Type: foldr :: (a -> b -> b) -> b -> [a] -> b
Example:
concat = foldr (a: b: a + b) "z"
@@ -42,16 +45,15 @@ rec {
else op (elemAt list n) (fold' (n + 1));
in fold' 0;
- /* `fold' is an alias of `foldr' for historic reasons */
+ /* `fold` is an alias of `foldr` for historic reasons */
# FIXME(Profpatsch): deprecate?
fold = foldr;
- /* “left fold”, like `foldr', but from the left:
+ /* “left fold”, like `foldr`, but from the left:
`foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
- Type:
- foldl :: (b -> a -> b) -> b -> [a] -> b
+ Type: foldl :: (b -> a -> b) -> b -> [a] -> b
Example:
lconcat = foldl (a: b: a + b) "z"
@@ -70,16 +72,20 @@ rec {
else op (foldl' (n - 1)) (elemAt list n);
in foldl' (length list - 1);
- /* Strict version of `foldl'.
+ /* Strict version of `foldl`.
The difference is that evaluation is forced upon access. Usually used
with small whole results (in contract with lazily-generated list or large
lists where only a part is consumed.)
+
+ Type: foldl' :: (b -> a -> b) -> b -> [a] -> b
*/
foldl' = builtins.foldl' or foldl;
/* Map with index starting from 0
+ Type: imap0 :: (int -> a -> b) -> [a] -> [b]
+
Example:
imap0 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-0" "b-1" ]
@@ -88,6 +94,8 @@ rec {
/* Map with index starting from 1
+ Type: imap1 :: (int -> a -> b) -> [a] -> [b]
+
Example:
imap1 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-1" "b-2" ]
@@ -96,6 +104,8 @@ rec {
/* Map and concatenate the result.
+ Type: concatMap :: (a -> [b]) -> [a] -> [b]
+
Example:
concatMap (x: [x] ++ ["z"]) ["a" "b"]
=> [ "a" "z" "b" "z" ]
@@ -118,15 +128,21 @@ rec {
/* Remove elements equal to 'e' from a list. Useful for buildInputs.
+ Type: remove :: a -> [a] -> [a]
+
Example:
remove 3 [ 1 3 4 3 ]
=> [ 1 4 ]
*/
- remove = e: filter (x: x != e);
+ remove =
+ # Element to remove from the list
+ e: filter (x: x != e);
/* Find the sole element in the list matching the specified
- predicate, returns `default' if no such element exists, or
- `multiple' if there are multiple matching elements.
+ predicate, returns `default` if no such element exists, or
+ `multiple` if there are multiple matching elements.
+
+ Type: findSingle :: (a -> bool) -> a -> a -> [a] -> a
Example:
findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ]
@@ -136,14 +152,24 @@ rec {
findSingle (x: x == 3) "none" "multiple" [ 1 9 ]
=> "none"
*/
- findSingle = pred: default: multiple: list:
+ findSingle =
+ # Predicate
+ pred:
+ # Default value to return if element was not found.
+ default:
+ # Default value to return if more than one element was found
+ multiple:
+ # Input list
+ list:
let found = filter pred list; len = length found;
in if len == 0 then default
else if len != 1 then multiple
else head found;
/* Find the first element in the list matching the specified
- predicate or returns `default' if no such element exists.
+ predicate or return `default` if no such element exists.
+
+ Type: findFirst :: (a -> bool) -> a -> [a] -> a
Example:
findFirst (x: x > 3) 7 [ 1 6 4 ]
@@ -151,12 +177,20 @@ rec {
findFirst (x: x > 9) 7 [ 1 6 4 ]
=> 7
*/
- findFirst = pred: default: list:
+ findFirst =
+ # Predicate
+ pred:
+ # Default value to return
+ default:
+ # Input list
+ list:
let found = filter pred list;
in if found == [] then default else head found;
- /* Return true iff function `pred' returns true for at least element
- of `list'.
+ /* Return true if function `pred` returns true for at least one
+ element of `list`.
+
+ Type: any :: (a -> bool) -> [a] -> bool
Example:
any isString [ 1 "a" { } ]
@@ -166,8 +200,10 @@ rec {
*/
any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
- /* Return true iff function `pred' returns true for all elements of
- `list'.
+ /* Return true if function `pred` returns true for all elements of
+ `list`.
+
+ Type: all :: (a -> bool) -> [a] -> bool
Example:
all (x: x < 3) [ 1 2 ]
@@ -177,19 +213,25 @@ rec {
*/
all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
- /* Count how many times function `pred' returns true for the elements
- of `list'.
+ /* Count how many elements of `list` match the supplied predicate
+ function.
+
+ Type: count :: (a -> bool) -> [a] -> int
Example:
count (x: x == 3) [ 3 2 3 4 6 ]
=> 2
*/
- count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
+ count =
+ # Predicate
+ pred: foldl' (c: x: if pred x then c + 1 else c) 0;
/* Return a singleton list or an empty list, depending on a boolean
value. Useful when building lists with optional elements
(e.g. `++ optional (system == "i686-linux") flashplayer').
+ Type: optional :: bool -> a -> [a]
+
Example:
optional true "foo"
=> [ "foo" ]
@@ -200,13 +242,19 @@ rec {
/* Return a list or an empty list, depending on a boolean value.
+ Type: optionals :: bool -> [a] -> [a]
+
Example:
optionals true [ 2 3 ]
=> [ 2 3 ]
optionals false [ 2 3 ]
=> [ ]
*/
- optionals = cond: elems: if cond then elems else [];
+ optionals =
+ # Condition
+ cond:
+ # List to return if condition is true
+ elems: if cond then elems else [];
/* If argument is a list, return it; else, wrap it in a singleton
@@ -223,20 +271,28 @@ rec {
/* Return a list of integers from `first' up to and including `last'.
+ Type: range :: int -> int -> [int]
+
Example:
range 2 4
=> [ 2 3 4 ]
range 3 2
=> [ ]
*/
- range = first: last:
+ range =
+ # First integer in the range
+ first:
+ # Last integer in the range
+ last:
if first > last then
[]
else
genList (n: first + n) (last - first + 1);
- /* Splits the elements of a list in two lists, `right' and
- `wrong', depending on the evaluation of a predicate.
+ /* Splits the elements of a list in two lists, `right` and
+ `wrong`, depending on the evaluation of a predicate.
+
+ Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] }
Example:
partition (x: x > 2) [ 5 1 2 3 4 ]
@@ -252,7 +308,7 @@ rec {
/* Splits the elements of a list into many lists, using the return value of a predicate.
Predicate should return a string which becomes keys of attrset `groupBy' returns.
- `groupBy'' allows to customise the combining function and initial value
+ `groupBy'` allows to customise the combining function and initial value
Example:
groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
@@ -268,10 +324,6 @@ rec {
xfce = [ { name = "xfce"; script = "xfce4-session &"; } ];
}
-
- groupBy' allows to customise the combining function and initial value
-
- Example:
groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
=> { true = 12; false = 3; }
*/
@@ -289,17 +341,27 @@ rec {
the merging stops at the shortest. How both lists are merged is defined
by the first argument.
+ Type: zipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c]
+
Example:
zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"]
=> ["he" "lo"]
*/
- zipListsWith = f: fst: snd:
+ zipListsWith =
+ # Function to zip elements of both lists
+ f:
+ # First list
+ fst:
+ # Second list
+ snd:
genList
(n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd));
/* Merges two lists of the same size together. If the sizes aren't the same
the merging stops at the shortest.
+ Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}]
+
Example:
zipLists [ 1 2 ] [ "a" "b" ]
=> [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ]
@@ -308,6 +370,8 @@ rec {
/* Reverse the order of the elements of a list.
+ Type: reverseList :: [a] -> [a]
+
Example:
reverseList [ "b" "o" "j" ]
@@ -321,8 +385,7 @@ rec {
`before a b == true` means that `b` depends on `a` (there's an
edge from `b` to `a`).
- Examples:
-
+ Example:
listDfs true hasPrefix [ "/home/user" "other" "/" "/home" ]
== { minimal = "/"; # minimal element
visited = [ "/home/user" ]; # seen elements (in reverse order)
@@ -336,7 +399,6 @@ rec {
rest = [ "/home" "other" ]; # everything else
*/
-
listDfs = stopOnCycles: before: list:
let
dfs' = us: visited: rest:
@@ -361,7 +423,7 @@ rec {
`before a b == true` means that `b` should be after `a`
in the result.
- Examples:
+ Example:
toposort hasPrefix [ "/home/user" "other" "/" "/home" ]
== { result = [ "/" "/home" "/home/user" "other" ]; }
@@ -376,7 +438,6 @@ rec {
toposort (a: b: a < b) [ 3 2 1 ] == { result = [ 1 2 3 ]; }
*/
-
toposort = before: list:
let
dfsthis = listDfs true before list;
@@ -467,26 +528,38 @@ rec {
/* Return the first (at most) N elements of a list.
+ Type: take :: int -> [a] -> [a]
+
Example:
take 2 [ "a" "b" "c" "d" ]
=> [ "a" "b" ]
take 2 [ ]
=> [ ]
*/
- take = count: sublist 0 count;
+ take =
+ # Number of elements to take
+ count: sublist 0 count;
/* Remove the first (at most) N elements of a list.
+ Type: drop :: int -> [a] -> [a]
+
Example:
drop 2 [ "a" "b" "c" "d" ]
=> [ "c" "d" ]
drop 2 [ ]
=> [ ]
*/
- drop = count: list: sublist count (length list) list;
+ drop =
+ # Number of elements to drop
+ count:
+ # Input list
+ list: sublist count (length list) list;
- /* Return a list consisting of at most ‘count’ elements of ‘list’,
- starting at index ‘start’.
+ /* Return a list consisting of at most `count` elements of `list`,
+ starting at index `start`.
+
+ Type: sublist :: int -> int -> [a] -> [a]
Example:
sublist 1 3 [ "a" "b" "c" "d" "e" ]
@@ -494,7 +567,13 @@ rec {
sublist 1 3 [ ]
=> [ ]
*/
- sublist = start: count: list:
+ sublist =
+ # Index at which to start the sublist
+ start:
+ # Number of elements to take
+ count:
+ # Input list
+ list:
let len = length list; in
genList
(n: elemAt list (n + start))
@@ -504,6 +583,10 @@ rec {
/* Return the last element of a list.
+ This function throws an error if the list is empty.
+
+ Type: last :: [a] -> a
+
Example:
last [ 1 2 3 ]
=> 3
@@ -512,7 +595,11 @@ rec {
assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
elemAt list (length list - 1);
- /* Return all elements but the last
+ /* Return all elements but the last.
+
+ This function throws an error if the list is empty.
+
+ Type: init :: [a] -> [a]
Example:
init [ 1 2 3 ]
@@ -523,7 +610,7 @@ rec {
take (length list - 1) list;
- /* return the image of the cross product of some lists by a function
+ /* Return the image of the cross product of some lists by a function.
Example:
crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
@@ -534,8 +621,9 @@ rec {
/* Remove duplicate elements from the list. O(n^2) complexity.
- Example:
+ Type: unique :: [a] -> [a]
+ Example:
unique [ 3 2 3 4 ]
=> [ 3 2 4 ]
*/
diff --git a/lib/options.nix b/lib/options.nix
index 0e342117530..791930eafbd 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -8,61 +8,72 @@ with lib.strings;
rec {
- # Returns true when the given argument is an option
- #
- # Examples:
- # isOption 1 // => false
- # isOption (mkOption {}) // => true
+ /* Returns true when the given argument is an option
+
+ Type: isOption :: a -> bool
+
+ Example:
+ isOption 1 // => false
+ isOption (mkOption {}) // => true
+ */
isOption = lib.isType "option";
- # Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
- #
- # default: Default value used when no definition is given in the configuration.
- # defaultText: Textual representation of the default, for in the manual.
- # example: Example value used in the manual.
- # description: String describing the option.
- # type: Option type, providing type-checking and value merging.
- # apply: Function that converts the option value to something else.
- # internal: Whether the option is for NixOS developers only.
- # visible: Whether the option shows up in the manual.
- # readOnly: Whether the option can be set only once
- # options: Obsolete, used by types.optionSet.
- #
- # All keys default to `null` when not given.
- #
- # Examples:
- # mkOption { } // => { _type = "option"; }
- # mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
+ /* Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
+
+ All keys default to `null` when not given.
+
+ Example:
+ mkOption { } // => { _type = "option"; }
+ mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
+ */
mkOption =
- { default ? null # Default value used when no definition is given in the configuration.
- , defaultText ? null # Textual representation of the default, for in the manual.
- , example ? null # Example value used in the manual.
- , description ? null # String describing the option.
- , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
- , type ? null # Option type, providing type-checking and value merging.
- , apply ? null # Function that converts the option value to something else.
- , internal ? null # Whether the option is for NixOS developers only.
- , visible ? null # Whether the option shows up in the manual.
- , readOnly ? null # Whether the option can be set only once
- , options ? null # Obsolete, used by types.optionSet.
+ {
+ # Default value used when no definition is given in the configuration.
+ default ? null,
+ # Textual representation of the default, for the manual.
+ defaultText ? null,
+ # Example value used in the manual.
+ example ? null,
+ # String describing the option.
+ description ? null,
+ # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
+ relatedPackages ? null,
+ # Option type, providing type-checking and value merging.
+ type ? null,
+ # Function that converts the option value to something else.
+ apply ? null,
+ # Whether the option is for NixOS developers only.
+ internal ? null,
+ # Whether the option shows up in the manual.
+ visible ? null,
+ # Whether the option can be set only once
+ readOnly ? null,
+ # Obsolete, used by types.optionSet.
+ options ? null
} @ attrs:
attrs // { _type = "option"; };
- # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off:
- #
- # Examples:
- # mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
- mkEnableOption = name: mkOption {
+ /* Creates an Option attribute set for a boolean value option i.e an
+ option to be toggled on or off:
+
+ Example:
+ mkEnableOption "foo"
+ => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
+ */
+ mkEnableOption =
+ # Name for the created option
+ name: mkOption {
default = false;
example = true;
description = "Whether to enable ${name}.";
type = lib.types.bool;
};
- # This option accept anything, but it does not produce any result. This
- # is useful for sharing a module across different module sets without
- # having to implement similar features as long as the value of the options
- # are not expected.
+ /* This option accepts anything, but it does not produce any result.
+
+ This is useful for sharing a module across different module sets
+ without having to implement similar features as long as the
+ values of the options are not accessed. */
mkSinkUndeclaredOptions = attrs: mkOption ({
internal = true;
visible = false;
@@ -102,18 +113,24 @@ rec {
else
val) (head defs).value defs;
- # Extracts values of all "value" keys of the given list
- #
- # Examples:
- # getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
- # getValues [ ] // => [ ]
+ /* Extracts values of all "value" keys of the given list.
+
+ Type: getValues :: [ { value :: a } ] -> [a]
+
+ Example:
+ getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
+ getValues [ ] // => [ ]
+ */
getValues = map (x: x.value);
- # Extracts values of all "file" keys of the given list
- #
- # Examples:
- # getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
- # getFiles [ ] // => [ ]
+ /* Extracts values of all "file" keys of the given list
+
+ Type: getFiles :: [ { file :: a } ] -> [a]
+
+ Example:
+ getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
+ getFiles [ ] // => [ ]
+ */
getFiles = map (x: x.file);
# Generate documentation template from the list of option declaration like
@@ -146,10 +163,13 @@ rec {
/* This function recursively removes all derivation attributes from
- `x' except for the `name' attribute. This is to make the
- generation of `options.xml' much more efficient: the XML
- representation of derivations is very large (on the order of
- megabytes) and is not actually used by the manual generator. */
+ `x` except for the `name` attribute.
+
+ This is to make the generation of `options.xml` much more
+ efficient: the XML representation of derivations is very large
+ (on the order of megabytes) and is not actually used by the
+ manual generator.
+ */
scrubOptionValue = x:
if isDerivation x then
{ type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
@@ -158,20 +178,21 @@ rec {
else x;
- /* For use in the ‘example’ option attribute. It causes the given
- text to be included verbatim in documentation. This is necessary
- for example values that are not simple values, e.g.,
- functions. */
+ /* For use in the `example` option attribute. It causes the given
+ text to be included verbatim in documentation. This is necessary
+ for example values that are not simple values, e.g., functions.
+ */
literalExample = text: { _type = "literalExample"; inherit text; };
+ # Helper functions.
- /* Helper functions. */
+ /* Convert an option, described as a list of the option parts in to a
+ safe, human readable version.
- # Convert an option, described as a list of the option parts in to a
- # safe, human readable version. ie:
- #
- # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
- # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+ Example:
+ (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
+ (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+ */
showOption = parts: let
escapeOptionPart = part:
let
diff --git a/lib/strings.nix b/lib/strings.nix
index 0c4095bb55c..4d7fa1e774d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,6 +12,8 @@ rec {
/* Concatenate a list of strings.
+ Type: concatStrings :: [string] -> string
+
Example:
concatStrings ["foo" "bar"]
=> "foobar"
@@ -20,15 +22,19 @@ rec {
/* Map a function over a list and concatenate the resulting strings.
+ Type: concatMapStrings :: (a -> string) -> [a] -> string
+
Example:
concatMapStrings (x: "a" + x) ["foo" "bar"]
=> "afooabar"
*/
concatMapStrings = f: list: concatStrings (map f list);
- /* Like `concatMapStrings' except that the f functions also gets the
+ /* Like `concatMapStrings` except that the f functions also gets the
position as a parameter.
+ Type: concatImapStrings :: (int -> a -> string) -> [a] -> string
+
Example:
concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
=> "1-foo2-bar"
@@ -37,17 +43,25 @@ rec {
/* Place an element between each element of a list
+ Type: intersperse :: a -> [a] -> [a]
+
Example:
intersperse "/" ["usr" "local" "bin"]
=> ["usr" "/" "local" "/" "bin"].
*/
- intersperse = separator: list:
+ intersperse =
+ # Separator to add between elements
+ separator:
+ # Input list
+ list:
if list == [] || length list == 1
then list
else tail (lib.concatMap (x: [separator x]) list);
/* Concatenate a list of strings with a separator between each element
+ Type: concatStringsSep :: string -> [string] -> string
+
Example:
concatStringsSep "/" ["usr" "local" "bin"]
=> "usr/local/bin"
@@ -55,43 +69,77 @@ rec {
concatStringsSep = builtins.concatStringsSep or (separator: list:
concatStrings (intersperse separator list));
- /* First maps over the list and then concatenates it.
+ /* Maps a function over a list of strings and then concatenates the
+ result with the specified separator interspersed between
+ elements.
+
+ Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
Example:
concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]
=> "FOO-BAR-BAZ"
*/
- concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
+ concatMapStringsSep =
+ # Separator to add between elements
+ sep:
+ # Function to map over the list
+ f:
+ # List of input strings
+ list: concatStringsSep sep (map f list);
- /* First imaps over the list and then concatenates it.
+ /* Same as `concatMapStringsSep`, but the mapping function
+ additionally receives the position of its argument.
+
+ Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
Example:
-
concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
=> "6-3-2"
*/
- concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list);
+ concatImapStringsSep =
+ # Separator to add between elements
+ sep:
+ # Function that receives elements and their positions
+ f:
+ # List of input strings
+ list: concatStringsSep sep (lib.imap1 f list);
- /* Construct a Unix-style search path consisting of each `subDir"
- directory of the given list of packages.
+ /* Construct a Unix-style, colon-separated search path consisting of
+ the given `subDir` appended to each of the given paths.
+
+ Type: makeSearchPath :: string -> [string] -> string
Example:
makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
=> "/root/bin:/usr/bin:/usr/local/bin"
- makeSearchPath "bin" ["/"]
- => "//bin"
+ makeSearchPath "bin" [""]
+ => "/bin"
*/
- makeSearchPath = subDir: packages:
- concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
+ makeSearchPath =
+ # Directory name to append
+ subDir:
+ # List of base paths
+ paths:
+ concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths));
- /* Construct a Unix-style search path, using given package output.
- If no output is found, fallback to `.out` and then to the default.
+ /* Construct a Unix-style search path by appending the given
+ `subDir` to the specified `output` of each of the packages. If no
+ output by the given name is found, fallback to `.out` and then to
+ the default.
+
+ Type: string -> string -> [package] -> string
Example:
makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
*/
- makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
+ makeSearchPathOutput =
+ # Package output to use
+ output:
+ # Directory name to append
+ subDir:
+ # List of packages
+ pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
/* Construct a library search path (such as RPATH) containing the
libraries for a set of packages
@@ -117,13 +165,12 @@ rec {
/* Construct a perl search path (such as $PERL5LIB)
- FIXME(zimbatm): this should be moved in perl-specific code
-
Example:
pkgs = import { }
makePerlPath [ pkgs.perlPackages.libnet ]
=> "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
*/
+ # FIXME(zimbatm): this should be moved in perl-specific code
makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
/* Construct a perl search path recursively including all dependencies (such as $PERL5LIB)
@@ -138,34 +185,51 @@ rec {
/* Depending on the boolean `cond', return either the given string
or the empty string. Useful to concatenate against a bigger string.
+ Type: optionalString :: bool -> string -> string
+
Example:
optionalString true "some-string"
=> "some-string"
optionalString false "some-string"
=> ""
*/
- optionalString = cond: string: if cond then string else "";
+ optionalString =
+ # Condition
+ cond:
+ # String to return if condition is true
+ string: if cond then string else "";
/* Determine whether a string has given prefix.
+ Type: hasPrefix :: string -> string -> bool
+
Example:
hasPrefix "foo" "foobar"
=> true
hasPrefix "foo" "barfoo"
=> false
*/
- hasPrefix = pref: str:
- substring 0 (stringLength pref) str == pref;
+ hasPrefix =
+ # Prefix to check for
+ pref:
+ # Input string
+ str: substring 0 (stringLength pref) str == pref;
/* Determine whether a string has given suffix.
+ Type: hasSuffix :: string -> string -> bool
+
Example:
hasSuffix "foo" "foobar"
=> false
hasSuffix "foo" "barfoo"
=> true
*/
- hasSuffix = suffix: content:
+ hasSuffix =
+ # Suffix to check for
+ suffix:
+ # Input string
+ content:
let
lenContent = stringLength content;
lenSuffix = stringLength suffix;
@@ -180,6 +244,8 @@ rec {
Also note that Nix treats strings as a list of bytes and thus doesn't
handle unicode.
+ Type: stringtoCharacters :: string -> [string]
+
Example:
stringToCharacters ""
=> [ ]
@@ -194,18 +260,25 @@ rec {
/* Manipulate a string character by character and replace them by
strings before concatenating the results.
+ Type: stringAsChars :: (string -> string) -> string -> string
+
Example:
stringAsChars (x: if x == "a" then "i" else x) "nax"
=> "nix"
*/
- stringAsChars = f: s:
- concatStrings (
+ stringAsChars =
+ # Function to map over each individual character
+ f:
+ # Input string
+ s: concatStrings (
map f (stringToCharacters s)
);
- /* Escape occurrence of the elements of ‘list’ in ‘string’ by
+ /* Escape occurrence of the elements of `list` in `string` by
prefixing it with a backslash.
+ Type: escape :: [string] -> string -> string
+
Example:
escape ["(" ")"] "(foo)"
=> "\\(foo\\)"
@@ -214,6 +287,8 @@ rec {
/* Quote string to be used safely within the Bourne shell.
+ Type: escapeShellArg :: string -> string
+
Example:
escapeShellArg "esc'ape\nme"
=> "'esc'\\''ape\nme'"
@@ -222,6 +297,8 @@ rec {
/* Quote all arguments to be safely passed to the Bourne shell.
+ Type: escapeShellArgs :: [string] -> string
+
Example:
escapeShellArgs ["one" "two three" "four'five"]
=> "'one' 'two three' 'four'\\''five'"
@@ -230,13 +307,15 @@ rec {
/* Turn a string into a Nix expression representing that string
+ Type: string -> string
+
Example:
escapeNixString "hello\${}\n"
=> "\"hello\\\${}\\n\""
*/
escapeNixString = s: escape ["$"] (builtins.toJSON s);
- /* Obsolete - use replaceStrings instead. */
+ # Obsolete - use replaceStrings instead.
replaceChars = builtins.replaceStrings or (
del: new: s:
let
@@ -256,6 +335,8 @@ rec {
/* Converts an ASCII string to lower-case.
+ Type: toLower :: string -> string
+
Example:
toLower "HOME"
=> "home"
@@ -264,6 +345,8 @@ rec {
/* Converts an ASCII string to upper-case.
+ Type: toUpper :: string -> string
+
Example:
toUpper "home"
=> "HOME"
@@ -273,7 +356,7 @@ rec {
/* Appends string context from another string. This is an implementation
detail of Nix.
- Strings in Nix carry an invisible `context' which is a list of strings
+ Strings in Nix carry an invisible `context` which is a list of strings
representing store paths. If the string is later used in a derivation
attribute, the derivation will properly populate the inputDrvs and
inputSrcs.
@@ -319,8 +402,9 @@ rec {
in
recurse 0 0;
- /* Return the suffix of the second argument if the first argument matches
- its prefix.
+ /* Return a string without the specified prefix, if the prefix matches.
+
+ Type: string -> string -> string
Example:
removePrefix "foo." "foo.bar.baz"
@@ -328,18 +412,23 @@ rec {
removePrefix "xxx" "foo.bar.baz"
=> "foo.bar.baz"
*/
- removePrefix = pre: s:
+ removePrefix =
+ # Prefix to remove if it matches
+ prefix:
+ # Input string
+ str:
let
- preLen = stringLength pre;
- sLen = stringLength s;
+ preLen = stringLength prefix;
+ sLen = stringLength str;
in
- if hasPrefix pre s then
- substring preLen (sLen - preLen) s
+ if hasPrefix prefix str then
+ substring preLen (sLen - preLen) str
else
- s;
+ str;
- /* Return the prefix of the second argument if the first argument matches
- its suffix.
+ /* Return a string without the specified suffix, if the suffix matches.
+
+ Type: string -> string -> string
Example:
removeSuffix "front" "homefront"
@@ -347,17 +436,21 @@ rec {
removeSuffix "xxx" "homefront"
=> "homefront"
*/
- removeSuffix = suf: s:
+ removeSuffix =
+ # Suffix to remove if it matches
+ suffix:
+ # Input string
+ str:
let
- sufLen = stringLength suf;
- sLen = stringLength s;
+ sufLen = stringLength suffix;
+ sLen = stringLength str;
in
- if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
- substring 0 (sLen - sufLen) s
+ if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
+ substring 0 (sLen - sufLen) str
else
- s;
+ str;
- /* Return true iff string v1 denotes a version older than v2.
+ /* Return true if string v1 denotes a version older than v2.
Example:
versionOlder "1.1" "1.2"
@@ -367,7 +460,7 @@ rec {
*/
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
- /* Return true iff string v1 denotes a version equal to or newer than v2.
+ /* Return true if string v1 denotes a version equal to or newer than v2.
Example:
versionAtLeast "1.1" "1.0"
@@ -459,6 +552,11 @@ rec {
/* Create a fixed width string with additional prefix to match
required width.
+ This function will fail if the input string is longer than the
+ requested length.
+
+ Type: fixedWidthString :: int -> string -> string
+
Example:
fixedWidthString 5 "0" (toString 15)
=> "00015"
@@ -502,12 +600,16 @@ rec {
=> false
*/
isStorePath = x:
- isCoercibleToString x
- && builtins.substring 0 1 (toString x) == "/"
- && dirOf x == builtins.storeDir;
+ if isCoercibleToString x then
+ let str = toString x; in
+ builtins.substring 0 1 str == "/"
+ && dirOf str == builtins.storeDir
+ else
+ false;
- /* Convert string to int
- Obviously, it is a bit hacky to use fromJSON that way.
+ /* Parse a string string as an int.
+
+ Type: string -> int
Example:
toInt "1337"
@@ -517,17 +619,18 @@ rec {
toInt "3.14"
=> error: floating point JSON numbers are not supported
*/
+ # Obviously, it is a bit hacky to use fromJSON this way.
toInt = str:
let may_be_int = builtins.fromJSON str; in
if builtins.isInt may_be_int
then may_be_int
else throw "Could not convert ${str} to int.";
- /* Read a list of paths from `file', relative to the `rootPath'. Lines
- beginning with `#' are treated as comments and ignored. Whitespace
- is significant.
+ /* Read a list of paths from `file`, relative to the `rootPath`.
+ Lines beginning with `#` are treated as comments and ignored.
+ Whitespace is significant.
- NOTE: this function is not performant and should be avoided
+ NOTE: This function is not performant and should be avoided.
Example:
readPathsFromFile /prefix
@@ -549,6 +652,8 @@ rec {
/* Read the contents of a file removing the trailing \n
+ Type: fileContents :: path -> string
+
Example:
$ echo "1.0" > ./version
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 8f5ef44ae72..0b3475fefb9 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -32,6 +32,7 @@ rec {
else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
+ else if final.isAvr then "avrlibc"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
extensions = {
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 8ba03a63fd8..a40c3892424 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -99,6 +99,34 @@ rec {
riscv64 = riscv "64";
riscv32 = riscv "32";
+ avr = {
+ config = "avr";
+ };
+
+ arm-embedded = {
+ config = "arm-none-eabi";
+ libc = "newlib";
+ };
+
+ aarch64-embedded = {
+ config = "aarch64-none-elf";
+ libc = "newlib";
+ };
+
+ ppc-embedded = {
+ config = "powerpc-none-eabi";
+ libc = "newlib";
+ };
+
+ i686-embedded = {
+ config = "i686-elf";
+ libc = "newlib";
+ };
+
+ x86_64-embedded = {
+ config = "x86_64-elf";
+ libc = "newlib";
+ };
#
# Darwin
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 65f560328af..2fcf1afe462 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -19,6 +19,7 @@ rec {
isRiscV = { cpu = { family = "riscv"; }; };
isSparc = { cpu = { family = "sparc"; }; };
isWasm = { cpu = { family = "wasm"; }; };
+ isAvr = { cpu = { family = "avr"; }; };
is32bit = { cpu = { bits = 32; }; };
is64bit = { cpu = { bits = 64; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bb26c93f3d7..db97a5c4b33 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -101,6 +101,8 @@ rec {
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
+
+ avr = { bits = 8; family = "avr"; };
};
################################################################################
@@ -117,6 +119,7 @@ rec {
apple = {};
pc = {};
+ none = {};
unknown = {};
};
@@ -200,6 +203,7 @@ rec {
cygnus = {};
msvc = {};
eabi = {};
+ elf = {};
androideabi = {};
android = {
@@ -255,9 +259,16 @@ rec {
setType "system" components;
mkSkeletonFromList = l: {
+ "1" = if elemAt l 0 == "avr"
+ then { cpu = elemAt l 0; kernel = "none"; abi = "unknown"; }
+ else throw "Target specification with 1 components is ambiguous";
"2" = # We only do 2-part hacks for things Nix already supports
if elemAt l 1 == "cygwin"
then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
+ else if (elemAt l 1 == "eabi")
+ then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
+ else if (elemAt l 1 == "elf")
+ then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
else { cpu = elemAt l 0; kernel = elemAt l 1; };
"3" = # Awkwards hacks, beware!
if elemAt l 1 == "apple"
@@ -268,6 +279,10 @@ rec {
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
else if hasPrefix "netbsd" (elemAt l 2)
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
+ else if (elemAt l 2 == "eabi")
+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
+ else if (elemAt l 2 == "elf")
+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
else throw "Target specification with 3 components is ambiguous";
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
}.${toString (length l)}
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 56783d99e3d..1ed072e9464 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -471,6 +471,7 @@ rec {
"x86_64-linux" = pc64;
"armv5tel-linux" = sheevaplug;
"armv6l-linux" = raspberrypi;
+ "armv7a-linux" = armv7l-hf-multiplatform;
"armv7l-linux" = armv7l-hf-multiplatform;
"aarch64-linux" = aarch64-multiplatform;
"mipsel-linux" = fuloong2f_n32;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 853d911cdc8..1604fbb39cb 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -112,7 +112,7 @@ runTests {
storePathAppendix = isStorePath
"${goodPath}/bin/python";
nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
- asPath = isStorePath goodPath;
+ asPath = isStorePath (/. + goodPath);
otherPath = isStorePath "/something/else";
otherVals = {
attrset = isStorePath {};
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 938df6ced47..e31cf73d27c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -9,23 +9,37 @@ rec {
Type: id :: a -> a
*/
- id = x: x;
+ id =
+ # The value to return
+ x: x;
/* The constant function
- Ignores the second argument.
- Or: Construct a function that always returns a static value.
+
+ Ignores the second argument. If called with only one argument,
+ constructs a function that always returns a static value.
Type: const :: a -> b -> a
Example:
let f = const 5; in f 10
=> 5
*/
- const = x: y: x;
+ const =
+ # Value to return
+ x:
+ # Value to ignore
+ y: x;
## Named versions corresponding to some builtin operators.
- /* Concatenate two lists */
+ /* Concatenate two lists
+
+ Type: concat :: [a] -> [a] -> [a]
+
+ Example:
+ concat [ 1 2 ] [ 3 4 ]
+ => [ 1 2 3 4 ]
+ */
concat = x: y: x ++ y;
/* boolean “or” */
@@ -53,27 +67,40 @@ rec {
bitNot = builtins.sub (-1);
/* Convert a boolean to a string.
- Note that toString on a bool returns "1" and "".
+
+ This function uses the strings "true" and "false" to represent
+ boolean values. Calling `toString` on a bool instead returns "1"
+ and "" (sic!).
+
+ Type: boolToString :: bool -> string
*/
boolToString = b: if b then "true" else "false";
/* Merge two attribute sets shallowly, right side trumps left
+ mergeAttrs :: attrs -> attrs -> attrs
+
Example:
mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
=> { a = 1; b = 3; c = 4; }
*/
- mergeAttrs = x: y: x // y;
+ mergeAttrs =
+ # Left attribute set
+ x:
+ # Right attribute set (higher precedence for equal keys)
+ y: x // y;
/* Flip the order of the arguments of a binary function.
+ Type: flip :: (a -> b -> c) -> (b -> a -> c)
+
Example:
flip concat [1] [2]
=> [ 2 1 ]
*/
flip = f: a: b: f b a;
- /* Apply function if argument is non-null.
+ /* Apply function if the supplied argument is non-null.
Example:
mapNullable (x: x+1) null
@@ -81,7 +108,11 @@ rec {
mapNullable (x: x+1) 22
=> 23
*/
- mapNullable = f: a: if isNull a then a else f a;
+ mapNullable =
+ # Function to call
+ f:
+ # Argument to check for null before passing it to `f`
+ a: if isNull a then a else f a;
# Pull in some builtins not included elsewhere.
inherit (builtins)
@@ -92,21 +123,27 @@ rec {
## nixpks version strings
- # The current full nixpkgs version number.
+ /* Returns the current full nixpkgs version number. */
version = release + versionSuffix;
- # The current nixpkgs version number as string.
+ /* Returns the current nixpkgs release number as string. */
release = lib.strings.fileContents ../.version;
- # The current nixpkgs version suffix as string.
+ /* Returns the current nixpkgs version suffix as string. */
versionSuffix =
let suffixFile = ../.version-suffix;
in if pathExists suffixFile
then lib.strings.fileContents suffixFile
else "pre-git";
- # Attempt to get the revision nixpkgs is from
- revisionWithDefault = default:
+ /* Attempts to return the the current revision of nixpkgs and
+ returns the supplied default value otherwise.
+
+ Type: revisionWithDefault :: string -> string
+ */
+ revisionWithDefault =
+ # Default value to return if revision can not be determined
+ default:
let
revisionFile = "${toString ./..}/.git-revision";
gitRepo = "${toString ./..}/.git";
@@ -117,14 +154,20 @@ rec {
nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
- # Whether we're being called by nix-shell.
+ /* Determine whether the function is being called from inside a Nix
+ shell.
+
+ Type: inNixShell :: bool
+ */
inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
## Integer operations
- # Return minimum/maximum of two numbers.
+ /* Return minimum of two numbers. */
min = x: y: if x < y then x else y;
+
+ /* Return maximum of two numbers. */
max = x: y: if x > y then x else y;
/* Integer modulus
@@ -158,8 +201,9 @@ rec {
second subtype, compare elements of a single subtype with `yes`
and `no` respectively.
- Example:
+ Type: (a -> bool) -> (a -> a -> int) -> (a -> a -> int) -> (a -> a -> int)
+ Example:
let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in
cmp "a" "z" => -1
@@ -170,31 +214,44 @@ rec {
# while
compare "fooa" "a" => 1
*/
- splitByAndCompare = p: yes: no: a: b:
+ splitByAndCompare =
+ # Predicate
+ p:
+ # Comparison function if predicate holds for both values
+ yes:
+ # Comparison function if predicate holds for neither value
+ no:
+ # First value to compare
+ a:
+ # Second value to compare
+ b:
if p a
then if p b then yes a b else -1
else if p b then 1 else no a b;
- /* Reads a JSON file. */
+ /* Reads a JSON file.
+
+ Type :: path -> any
+ */
importJSON = path:
builtins.fromJSON (builtins.readFile path);
## Warnings
- /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
- to expand to Nix builtins that carry metadata so that Nix can filter out
- the INFO messages without parsing the message string.
+ # See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
+ # to expand to Nix builtins that carry metadata so that Nix can filter out
+ # the INFO messages without parsing the message string.
+ #
+ # Usage:
+ # {
+ # foo = lib.warn "foo is deprecated" oldFoo;
+ # }
+ #
+ # TODO: figure out a clever way to integrate location information from
+ # something like __unsafeGetAttrPos.
- Usage:
- {
- foo = lib.warn "foo is deprecated" oldFoo;
- }
-
- TODO: figure out a clever way to integrate location information from
- something like __unsafeGetAttrPos.
- */
warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13fa3ba9151..60354432ad9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -143,6 +143,11 @@
github = "ahmedtd";
name = "Taahir Ahmed";
};
+ ahuzik = {
+ email = "ales.guzik@gmail.com";
+ github = "alesguzik";
+ name = "Ales Huzik";
+ };
aij = {
email = "aij+git@mrph.org";
github = "aij";
@@ -401,6 +406,11 @@
github = "AveryLychee";
name = "Avery Lychee";
};
+ averelld = {
+ email = "averell+nixos@rxd4.com";
+ github = "averelld";
+ name = "averelld";
+ };
avnik = {
email = "avn@avnik.info";
github = "avnik";
@@ -495,6 +505,11 @@
github = "bennofs";
name = "Benno Fünfstück";
};
+ benpye = {
+ email = "ben@curlybracket.co.uk";
+ github = "benpye";
+ name = "Ben Pye";
+ };
benwbooth = {
email = "benwbooth@gmail.com";
github = "benwbooth";
@@ -2967,6 +2982,11 @@
github = "nequissimus";
name = "Tim Steinbach";
};
+ nikitavoloboev = {
+ email = "nikita.voloboev@gmail.com";
+ github = "nikitavoloboev";
+ name = "Nikita Voloboev";
+ };
nfjinjing = {
email = "nfjinjing@gmail.com";
github = "nfjinjing";
@@ -3641,6 +3661,11 @@
github = "roosemberth";
name = "Roosembert (Roosemberth) Palacios";
};
+ royneary = {
+ email = "christian@ulrich.earth";
+ github = "royneary";
+ name = "Christian Ulrich";
+ };
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";
@@ -3890,6 +3915,11 @@
github = "sjagoe";
name = "Simon Jagoe";
};
+ sjau = {
+ email = "nixos@sjau.ch";
+ github = "sjau";
+ name = "Stephan Jau";
+ };
sjmackenzie = {
email = "setori88@gmail.com";
github = "sjmackenzie";
@@ -4138,6 +4168,11 @@
github = "taku0";
name = "Takuo Yonezawa";
};
+ talyz = {
+ email = "kim.lindberger@gmail.com";
+ github = "talyz";
+ name = "Kim Lindberger";
+ };
tari = {
email = "peter@taricorp.net";
github = "tari";
@@ -4613,6 +4648,11 @@
github = "wucke13";
name = "Wucke";
};
+ wykurz = {
+ email = "wykurz@gmail.com";
+ github = "wykurz";
+ name = "Mateusz Wykurz";
+ };
wyvie = {
email = "elijahrum@gmail.com";
github = "wyvie";
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index 2a98fb12623..d03dbc4d705 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -15,7 +15,7 @@ containers.database =
{ config =
{ config, pkgs, ... }:
{ = true;
- = pkgs.postgresql96;
+ = pkgs.postgresql_9_6;
};
};
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 8a1a39c98c1..c77cfe137ba 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
pkgs.emacs
];
- = pkgs.postgresql90;
+ = pkgs.postgresql_10;
The latter option definition changes the default PostgreSQL package used
- by NixOS’s PostgreSQL service to 9.0. For more information on packages,
+ by NixOS’s PostgreSQL service to 10.x. For more information on packages,
including how to add new ones, see .
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index b66adcedce6..47a19ac82c0 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -34,13 +34,4 @@
Similarly, UDP port ranges can be opened through
.
-
-
- Also of interest is
-
- = true;
-
- to allow the machine to respond to ping requests. (ICMPv6 pings are always
- allowed.)
-
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 0ddf40acbfc..8715a05f508 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -637,6 +637,11 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
anyways for clarity.
+
+
+ Groups kvm and render are introduced now, as systemd requires them.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 3cef0fb1c1d..fa77f7fae44 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -97,6 +97,16 @@
start org.nixos.nix-daemon.
+
+
+ The Syncthing state and configuration data has been moved from
+ services.syncthing.dataDir to the newly defined
+ services.syncthing.configDir, which default to
+ /var/lib/syncthing/.config/syncthing.
+ This change makes possible to share synced directories using ACLs
+ without Syncthing resetting the permission on every start.
+
+
@@ -137,6 +147,56 @@
make sure to update your configuration if you want to keep proglodyte-wasm
+
+
+ OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
+ backwards-incompatible changes to the configuration file format. See
+ man smtpd.conf for more information on the new file
+ format.
+
+
+
+
+ The versioned postgresql have been renamed to use
+ underscore number seperators. For example, postgresql96
+ has been renamed to postgresql_9_6.
+
+
+
+
+ Package consul-ui and passthrough consul.ui have been removed.
+ The package consul now uses upstream releases that vendor the UI into the binary.
+ See #48714
+ for details.
+
+
+
+
+ Slurm introduces the new option
+ services.slurm.stateSaveLocation,
+ which is now set to /var/spool/slurm by default
+ (instead of /var/spool).
+ Make sure to move all files to the new directory or to set the option accordingly.
+
+
+ The slurmctld now runs as user slurm instead of root.
+ If you want to keep slurmctld running as root, set
+ services.slurm.user = root.
+
+
+ The options services.slurm.nodeName and
+ services.slurm.partitionName are now sets of
+ strings to correctly reflect that fact that each of these
+ options can occour more than once in the configuration.
+
+
+
+
+ The solr package has been upgraded from 4.10.3 to 7.5.0 and has undergone
+ some major changes. The services.solr module has been updated to reflect
+ these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
+
+
Package ckb is renamed to ckb-next,
@@ -162,6 +222,15 @@
Matomo version.
+
+
+ The deprecated truecrypt package has been removed
+ and truecrypt attribute is now an alias for
+ veracrypt. VeraCrypt is backward-compatible with
+ TrueCrypt volumes. Note that cryptsetup also
+ supports loading TrueCrypt volumes.
+
+
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index f71e264c347..5f05b037bdd 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -53,7 +53,8 @@ in rec {
inherit prefix check;
modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
args = extraArgs;
- specialArgs = { modulesPath = ../modules; } // specialArgs;
+ specialArgs =
+ { modulesPath = builtins.toString ../modules; } // specialArgs;
}) config options;
# These are the extra arguments passed to every module. In
diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
index fd805f7f943..9b920b989fc 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -1,3 +1,7 @@
+/* Build a channel tarball. These contain, in addition to the nixpkgs
+ * expressions themselves, files that indicate the version of nixpkgs
+ * that they represent.
+ */
{ pkgs, nixpkgs, version, versionSuffix }:
pkgs.releaseTools.makeSourceTarball {
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 1ef5313d3fd..627cce67e97 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -16,6 +16,13 @@ let
resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request"
++ optional cfg.dnsExtensionMechanism "edns0";
+
+
+ localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
+ localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1";
+
+ localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]));
+
in
{
@@ -23,8 +30,7 @@ in
options = {
networking.hosts = lib.mkOption {
- type = types.attrsOf ( types.listOf types.str );
- default = {};
+ type = types.attrsOf (types.listOf types.str);
example = literalExample ''
{
"127.0.0.1" = [ "foo.bar.baz" ];
@@ -192,6 +198,29 @@ in
config = {
+ assertions = [{
+ assertion = localhostMapped4;
+ message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"'';
+ } {
+ assertion = !cfg.enableIPv6 || localhostMapped6;
+ message = ''`networking.hosts` doesn't map "::1" to "localhost"'';
+ } {
+ assertion = !localhostMultiple;
+ message = ''
+ `networking.hosts` maps "localhost" to something other than "127.0.0.1"
+ or "::1". This will break some applications. Please use
+ `networking.extraHosts` if you really want to add such a mapping.
+ '';
+ }];
+
+ networking.hosts = {
+ "127.0.0.1" = [ "localhost" ];
+ } // optionalAttrs (cfg.hostName != "") {
+ "127.0.1.1" = [ cfg.hostName ];
+ } // optionalAttrs cfg.enableIPv6 {
+ "::1" = [ "localhost" ];
+ };
+
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana-etc + "/etc/services";
@@ -199,29 +228,14 @@ in
# /etc/protocols: IP protocol numbers.
"protocols".source = pkgs.iana-etc + "/etc/protocols";
- # /etc/rpc: RPC program numbers.
- "rpc".source = pkgs.glibc.out + "/etc/rpc";
-
# /etc/hosts: Hostname-to-IP mappings.
- "hosts".text =
- let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
- allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
- userLocalHosts = optionalString
- ( builtins.hasAttr "127.0.0.1" cfg.hosts )
- ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
- userLocalHosts6 = optionalString
- ( builtins.hasAttr "::1" cfg.hosts )
- ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
- otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
- in
- ''
- 127.0.0.1 ${userLocalHosts} localhost
- ${optionalString cfg.enableIPv6 ''
- ::1 ${userLocalHosts6} localhost
- ''}
- ${otherHosts}
- ${cfg.extraHosts}
- '';
+ "hosts".text = let
+ oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
+ allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
+ in ''
+ ${allToString cfg.hosts}
+ ${cfg.extraHosts}
+ '';
# /etc/host.conf: resolver configuration file
"host.conf".text = cfg.hostConf;
@@ -251,6 +265,9 @@ in
"resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
} // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+ } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
+ # /etc/rpc: RPC program numbers.
+ "rpc".source = pkgs.glibc.out + "/etc/rpc";
};
networking.proxy.envVars =
@@ -296,4 +313,4 @@ in
};
- }
+}
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index d4aa5950629..67f7105fe2f 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with pkgs;
with lib;
@@ -19,7 +19,7 @@ let
# Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
# using 32bit alsa on 64bit linux.
- enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
+ enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
myConfigFile =
@@ -63,7 +63,7 @@ let
pcm_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins
- "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
}
pcm.!default {
type pulse
@@ -72,7 +72,7 @@ let
ctl_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins
- "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
}
ctl.!default {
type pulse
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index c07e19bd03c..1793dc628ed 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -19,7 +19,9 @@ let
pkgs.diffutils
pkgs.findutils
pkgs.gawk
- pkgs.glibc # for ldd, getent
+ pkgs.stdenv.cc.libc
+ pkgs.getent
+ pkgs.getconf
pkgs.gnugrep
pkgs.gnupatch
pkgs.gnused
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 426e1666a81..137ee243813 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -266,7 +266,7 @@ let
(mkIf config.isNormalUser {
group = mkDefault "users";
createHome = mkDefault true;
- home = mkDefault "/home/${name}";
+ home = mkDefault "/home/${config.name}";
useDefaultShell = mkDefault true;
isSystemUser = mkDefault false;
})
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 46d06d71333..48e0072e089 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -148,7 +148,7 @@ in
[ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
hardware.opengl.package = mkDefault (makePackage pkgs);
- hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
+ hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux);
boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
};
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 50af022b93c..ab9e0c92020 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary AMDGPU-PRO drivers.
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -11,7 +11,7 @@ let
enabled = elem "amdgpu-pro" drivers;
package = config.boot.kernelPackages.amdgpu-pro;
- package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
+ package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
opengl = config.hardware.opengl;
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 2fa37af6ca5..6102919f015 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary ATI X11 / OpenGL drivers.
-{ config, lib, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -24,7 +24,7 @@ in
{ name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
hardware.opengl.package = ati_x11;
- hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
+ hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
environment.systemPackages = [ ati_x11 ];
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index f8524ab99e8..21e12395498 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
-{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, ... }:
with lib;
@@ -25,7 +25,7 @@ let
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
nvidia_libs32 =
if versionOlder nvidia_x11.version "391" then
- ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+ ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
else
(nvidiaForKernel config.boot.kernelPackages).lib32;
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 3dc0f606bf6..bcdbffdc20b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -7,4 +7,6 @@
imports =
[ ./installation-cd-base.nix
];
+
+ fonts.fontconfig.enable = false;
}
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 8ca3592f380..2e1b4b3998b 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -22,4 +22,42 @@ with lib;
powerManagement.enable = false;
system.stateVersion = mkDefault "18.03";
+
+ installer.cloneConfigExtra = ''
+ # Let demo build as a trusted user.
+ # nix.trustedUsers = [ "demo" ];
+
+ # Mount a VirtualBox shared folder.
+ # This is configurable in the VirtualBox menu at
+ # Machine / Settings / Shared Folders.
+ # fileSystems."/mnt" = {
+ # fsType = "vboxsf";
+ # device = "nameofdevicetomount";
+ # options = [ "rw" ];
+ # };
+
+ # By default, the NixOS VirtualBox demo image includes SDDM and Plasma.
+ # If you prefer another desktop manager or display manager, you may want
+ # to disable the default.
+ # services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
+ # services.xserver.displayManager.sddm.enable = lib.mkForce false;
+
+ # Enable GDM/GNOME by uncommenting above two lines and two lines below.
+ # services.xserver.displayManager.gdm.enable = true;
+ # services.xserver.desktopManager.gnome3.enable = true;
+
+ # Set your time zone.
+ # time.timeZone = "Europe/Amsterdam";
+
+ # List packages installed in system profile. To search, run:
+ # \$ nix search wget
+ # environment.systemPackages = with pkgs; [
+ # wget vim
+ # ];
+
+ # Enable the OpenSSH daemon.
+ # services.openssh.enable = true;
+
+ system.stateVersion = mkDefault "18.03";
+ '';
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0b4ed6d3b62..6e7f0a007bc 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -331,6 +331,9 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
+ slurm = 307;
+ kapacitor = 308;
+ solr = 309;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -385,7 +388,7 @@
virtuoso = 44;
#rtkit = 45; # unused
dovecot2 = 46;
- #dovenull = 47; # unused
+ dovenull2 = 47;
prayer = 49;
mpd = 50;
clamav = 51;
@@ -622,6 +625,9 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
+ slurm = 307;
+ kapacitor = 308;
+ solr = 309;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7f9833e184a..1dfd2c3c6cf 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -208,7 +208,6 @@ in
config = {
_module.args = {
pkgs = cfg.pkgs;
- pkgs_i686 = cfg.pkgs.pkgsi686Linux;
};
};
}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5158fcac492..be79b72291a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -108,7 +108,6 @@
./programs/oblogout.nix
./programs/plotinus.nix
./programs/qt5ct.nix
- ./programs/rootston.nix
./programs/screen.nix
./programs/sedutil.nix
./programs/slock.nix
@@ -121,11 +120,13 @@
./programs/sysdig.nix
./programs/systemtap.nix
./programs/sway.nix
+ ./programs/sway-beta.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/udevil.nix
./programs/venus.nix
./programs/vim.nix
+ ./programs/wavemon.nix
./programs/way-cooler.nix
./programs/wireshark.nix
./programs/xfs_quota.nix
@@ -234,6 +235,7 @@
./services/desktops/dleyna-server.nix
./services/desktops/flatpak.nix
./services/desktops/geoclue2.nix
+ ./services/desktops/gsignond.nix
./services/desktops/pipewire.nix
./services/desktops/gnome3/at-spi2-core.nix
./services/desktops/gnome3/chrome-gnome-shell.nix
@@ -431,6 +433,7 @@
./services/monitoring/hdaps.nix
./services/monitoring/heapster.nix
./services/monitoring/incron.nix
+ ./services/monitoring/kapacitor.nix
./services/monitoring/longview.nix
./services/monitoring/monit.nix
./services/monitoring/munin.nix
@@ -504,6 +507,7 @@
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
./services/networking/epmd.nix
+ ./services/networking/eternal-terminal.nix
./services/networking/fakeroute.nix
./services/networking/ferm.nix
./services/networking/firefox/sync-server.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 5aaffa4f1f2..7e14b0e2114 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -7,7 +7,7 @@
# Include some utilities that are useful for installing or repairing
# the system.
environment.systemPackages = [
- pkgs.w3m-nox # needed for the manual anyway
+ pkgs.w3m-nographics # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr
@@ -19,6 +19,9 @@
pkgs.cryptsetup # needed for dm-crypt volumes
pkgs.mkpasswd # for generating password files
+ # Some text editors.
+ pkgs.vim
+
# Some networking tools.
pkgs.fuse
pkgs.fuse3
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 99d4774584f..3f669ba7d2e 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -48,6 +48,8 @@ let
{
imports = [ ${toString config.installer.cloneConfigIncludes} ];
+
+ ${config.installer.cloneConfigExtra}
}
'';
@@ -73,6 +75,13 @@ in
'';
};
+ installer.cloneConfigExtra = mkOption {
+ default = "";
+ description = ''
+ Extra text to include in the cloned configuration.nix included in this
+ installer.
+ '';
+ };
};
config = {
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index d51ed195580..580ea4a58e5 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -63,7 +63,7 @@ with lib;
# Tell the Nix evaluator to garbage collect more aggressively.
# This is desirable in memory-constrained environments that don't
# (yet) have swap set up.
- environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
+ environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
# Make the installer more likely to succeed in low memory
# environments. The kernel's overcommit heustistics bite us
@@ -87,9 +87,6 @@ with lib;
# console less cumbersome if the machine has a public IP.
networking.firewall.logRefusedConnections = mkDefault false;
- environment.systemPackages = [ pkgs.vim ];
-
-
# Allow the user to log in as root without a password.
users.users.root.initialHashedPassword = "";
};
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 0fbc77ea44c..d325fff6a57 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -16,7 +16,7 @@ let
# programmable completion. If we do, enable all modules installed in
# the system and user profile in obsolete /etc/bash_completion.d/
# directories. Bash loads completions in all
- # $XDG_DATA_DIRS/share/bash-completion/completions/
+ # $XDG_DATA_DIRS/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"
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
deleted file mode 100644
index 842d9e6cfb4..00000000000
--- a/nixos/modules/programs/rootston.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.programs.rootston;
-
- rootstonWrapped = pkgs.writeScriptBin "rootston" ''
- #! ${pkgs.runtimeShell}
- 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/shell.nix b/nixos/modules/programs/shell.nix
index 6aa0262e3a4..9842e2bef64 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -13,7 +13,7 @@ with lib;
# Set up the per-user profile.
mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
- echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
+ echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
fi
if [ -w "$HOME" ]; then
@@ -35,7 +35,7 @@ with lib;
NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
- echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
+ echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
fi
# Set up a default Nix expression from which to install stuff.
diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
new file mode 100644
index 00000000000..e651ea4cca3
--- /dev/null
+++ b/nixos/modules/programs/sway-beta.nix
@@ -0,0 +1,79 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sway-beta;
+ swayPackage = cfg.package;
+
+ swayWrapped = pkgs.writeShellScriptBin "sway" ''
+ ${cfg.extraSessionCommands}
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway
+ '';
+ swayJoined = pkgs.symlinkJoin {
+ name = "sway-joined";
+ paths = [ swayWrapped swayPackage ];
+ };
+in {
+ options.programs.sway-beta = {
+ enable = mkEnableOption ''
+ Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0
+ '';
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.sway-beta;
+ defaultText = "pkgs.sway-beta";
+ description = ''
+ The package to be used for `sway`.
+ '';
+ };
+
+ extraSessionCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ export SDL_VIDEODRIVER=wayland
+ # needs qt5.qtwayland in systemPackages
+ export QT_QPA_PLATFORM=wayland
+ export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+ # Fix for some Java AWT applications (e.g. Android Studio),
+ # use this if they aren't displayed properly:
+ export _JAVA_AWT_WM_NONREPARENTING=1
+ '';
+ description = ''
+ Shell commands executed just before Sway is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ xwayland rxvt_unicode dmenu
+ ];
+ defaultText = literalExample ''
+ with pkgs; [ xwayland rxvt_unicode dmenu ];
+ '';
+ example = literalExample ''
+ with pkgs; [
+ xwayland
+ i3status i3status-rust
+ termite rofi light
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
+ 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 colemickens ];
+}
diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix
new file mode 100644
index 00000000000..ac665fe4a02
--- /dev/null
+++ b/nixos/modules/programs/wavemon.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.wavemon;
+in {
+ options = {
+ programs.wavemon = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to add wavemon to the global environment and configure a
+ setcap wrapper for it.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [ wavemon ];
+ security.wrappers.wavemon = {
+ source = "${pkgs.wavemon}/bin/wavemon";
+ capabilities = "cap_net_admin+ep";
+ };
+ };
+}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index eb74b9bcac1..aa2b5c0b2df 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -28,7 +28,10 @@ with lib;
(config:
let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
in if enabled then [ pkgs.gutenprint ] else [ ]))
- (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ])
+ (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
+ (config:
+ let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
+ in if value != "" then [ value ] else []))
(mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
(mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
(mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index dfbf5d859ba..498c2f25d1c 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -28,7 +28,7 @@ with lib;
capability setuid,
network inet raw,
- ${pkgs.glibc.out}/lib/*.so mr,
+ ${pkgs.stdenv.cc.libc.out}/lib/*.so mr,
${pkgs.libcap.lib}/lib/libcap.so* mr,
${pkgs.attr.out}/lib/libattr.so* mr,
diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index e2b84c3e3b3..62a499ea624 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -170,4 +170,6 @@ in {
'';
}) cfg.params;
};
+
+ meta.maintainers = with lib.maintainers; [ ekleog ];
}
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 3a1ffc55e5f..a54ef2e6fca 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -20,7 +20,6 @@ with lib;
KERNEL=="random", TAG+="systemd"
SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
- ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
'';
systemd.services.rngd = {
@@ -30,8 +29,7 @@ with lib;
description = "Hardware RNG Entropy Gatherer Daemon";
- serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
- (if config.services.tcsd.enable then " --no-tpm=1" else "");
+ serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f";
};
};
}
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix
index 165580b9783..c6b1b0cc0bd 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@@ -53,6 +53,9 @@ in
Type = "notify";
NotifyAccess = "all";
};
+ restartTriggers = [
+ config.environment.etc."salt/master".source
+ ];
};
};
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index 9ecefb32cfa..c8fa9461a20 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -15,7 +15,6 @@ let
# Default is in /etc/salt/pki/minion
pki_dir = "/var/lib/salt/pki/minion";
} cfg.configuration;
- configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
in
@@ -28,15 +27,24 @@ in
default = {};
description = ''
Salt minion configuration as Nix attribute set.
- See
- for details.
+ See
+ for details.
'';
};
};
};
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ salt ];
+ environment = {
+ # Set this up in /etc/salt/minion so `salt-call`, etc. work.
+ # The alternatives are
+ # - passing --config-dir to all salt commands, not just the minion unit,
+ # - setting aglobal environment variable.
+ etc."salt/minion".source = pkgs.writeText "minion" (
+ builtins.toJSON fullConfig
+ );
+ systemPackages = with pkgs; [ salt ];
+ };
systemd.services.salt-minion = {
description = "Salt Minion";
wantedBy = [ "multi-user.target" ];
@@ -45,11 +53,14 @@ in
utillinux
];
serviceConfig = {
- ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
+ ExecStart = "${pkgs.salt}/bin/salt-minion";
LimitNOFILE = 8192;
Type = "notify";
NotifyAccess = "all";
};
+ restartTriggers = [
+ config.environment.etc."salt/minion".source
+ ];
};
};
}
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 09174ed39f5..cd481212db2 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -6,13 +6,18 @@ let
cfg = config.services.slurm;
# configuration file can be generated by http://slurm.schedmd.com/configurator.html
+
+ defaultUser = "slurm";
+
configFile = pkgs.writeTextDir "slurm.conf"
''
ClusterName=${cfg.clusterName}
+ StateSaveLocation=${cfg.stateSaveLocation}
+ SlurmUser=${cfg.user}
${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
- ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
- ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
+ ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
+ ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
PlugStackConfig=${plugStackConfig}
ProctrackType=${cfg.procTrackType}
${cfg.extraConfig}
@@ -24,12 +29,19 @@ let
${cfg.extraPlugstackConfig}
'';
-
cgroupConfig = pkgs.writeTextDir "cgroup.conf"
''
${cfg.extraCgroupConfig}
'';
+ slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf"
+ ''
+ DbdHost=${cfg.dbdserver.dbdHost}
+ SlurmUser=${cfg.user}
+ StorageType=accounting_storage/mysql
+ ${cfg.dbdserver.extraConfig}
+ '';
+
# slurm expects some additional config files to be
# in the same directory as slurm.conf
etcSlurm = pkgs.symlinkJoin {
@@ -43,6 +55,8 @@ in
###### interface
+ meta.maintainers = [ maintainers.markuskowa ];
+
options = {
services.slurm = {
@@ -60,6 +74,27 @@ in
};
};
+ dbdserver = {
+ enable = mkEnableOption "SlurmDBD service";
+
+ dbdHost = mkOption {
+ type = types.str;
+ default = config.networking.hostName;
+ description = ''
+ Hostname of the machine where slurmdbd
+ is running (i.e. name returned by hostname -s).
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra configuration for slurmdbd.conf
+ '';
+ };
+ };
+
client = {
enable = mkEnableOption "slurm client daemon";
};
@@ -116,9 +151,9 @@ in
};
nodeName = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "linux[1-32] CPUs=1 State=UNKNOWN";
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];'';
description = ''
Name that SLURM uses to refer to a node (or base partition for BlueGene
systems). Typically this would be the string that "/bin/hostname -s"
@@ -127,9 +162,9 @@ in
};
partitionName = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP";
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];'';
description = ''
Name by which the partition may be referenced. Note that now you have
to write the partition's parameters after the name.
@@ -150,7 +185,7 @@ in
};
procTrackType = mkOption {
- type = types.string;
+ type = types.str;
default = "proctrack/linuxproc";
description = ''
Plugin to be used for process tracking on a job step basis.
@@ -159,6 +194,25 @@ in
'';
};
+ stateSaveLocation = mkOption {
+ type = types.str;
+ default = "/var/spool/slurmctld";
+ description = ''
+ Directory into which the Slurm controller, slurmctld, saves its state.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = defaultUser;
+ description = ''
+ Set this option when you want to run the slurmctld daemon
+ as something else than the default slurm user "slurm".
+ Note that the UID of this user needs to be the same
+ on all nodes.
+ '';
+ };
+
extraConfig = mkOption {
default = "";
type = types.lines;
@@ -184,6 +238,8 @@ in
used when procTrackType=proctrack/cgroup.
'';
};
+
+
};
};
@@ -220,12 +276,24 @@ in
'';
};
- in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) {
+ in mkIf ( cfg.enableStools ||
+ cfg.client.enable ||
+ cfg.server.enable ||
+ cfg.dbdserver.enable ) {
environment.systemPackages = [ wrappedSlurm ];
services.munge.enable = mkDefault true;
+ # use a static uid as default to ensure it is the same on all nodes
+ users.users.slurm = mkIf (cfg.user == defaultUser) {
+ name = defaultUser;
+ group = "slurm";
+ uid = config.ids.uids.slurm;
+ };
+
+ users.groups.slurm.gid = config.ids.uids.slurm;
+
systemd.services.slurmd = mkIf (cfg.client.enable) {
path = with pkgs; [ wrappedSlurm coreutils ]
++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
@@ -261,6 +329,29 @@ in
PIDFile = "/run/slurmctld.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
+
+ preStart = ''
+ mkdir -p ${cfg.stateSaveLocation}
+ chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
+ '';
+ };
+
+ systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) {
+ path = with pkgs; [ wrappedSlurm munge coreutils ];
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "munged.service" "mysql.service" ];
+ requires = [ "munged.service" "mysql.service" ];
+
+ # slurm strips the last component off the path
+ environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf";
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${cfg.package}/bin/slurmdbd";
+ PIDFile = "/run/slurmdbd.pid";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ };
};
};
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index de2a757196a..f592be0e768 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -55,7 +55,7 @@ in
package = mkOption {
type = types.package;
- example = literalExample "pkgs.postgresql96";
+ example = literalExample "pkgs.postgresql_9_6";
description = ''
PostgreSQL package to use.
'';
@@ -118,7 +118,7 @@ in
extraPlugins = mkOption {
type = types.listOf types.path;
default = [];
- example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
+ example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]";
description = ''
When this list contains elements a new store path is created.
PostgreSQL and the elements are symlinked into it. Then pg_config,
@@ -167,9 +167,9 @@ in
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
# systems!
- mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
- else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
- else pkgs.postgresql94);
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
+ else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
+ else pkgs.postgresql_9_4);
services.postgresql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
@@ -271,5 +271,5 @@ in
};
meta.doc = ./postgresql.xml;
-
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
}
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index f89f0d65316..14f4d4909bc 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -27,12 +27,12 @@
configuration.nix:
= true;
- = pkgs.postgresql94;
+ = pkgs.postgresql_9_4;
Note that you are required to specify the desired version of PostgreSQL
- (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL
- version requires a database dump and reload (see below), NixOS cannot
- provide a default value for
+ (e.g. pkgs.postgresql_9_4). Since upgrading your
+ PostgreSQL version requires a database dump and reload (see below), NixOS
+ cannot provide a default value for
such as the most recent
release of PostgreSQL.
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
new file mode 100644
index 00000000000..cf26e05d5c1
--- /dev/null
+++ b/nixos/modules/services/desktops/gsignond.nix
@@ -0,0 +1,43 @@
+# Accounts-SSO gSignOn daemon
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; };
+in
+{
+
+ ###### interface
+
+ options = {
+
+ services.gsignond = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable gSignOn daemon, a DBus service
+ which performs user authentication on behalf of its clients.
+ '';
+ };
+
+ plugins = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ description = ''
+ What plugins to use with the gSignOn daemon.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gsignond.enable {
+ environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf";
+ services.dbus.packages = [ package ];
+ };
+
+}
diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix
index dfefc1171e6..c06a0665d02 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixos/modules/services/hardware/trezord.nix
@@ -27,13 +27,13 @@ in {
destination = "/etc/udev/rules.d/51-trezor.rules";
text = ''
# TREZOR v1 (One)
- SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
- KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
+ SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+ KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess"
# TREZOR v2 (T)
- SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
- SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
- KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
+ SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+ SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+ KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess"
'';
});
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 2198842a451..1da47349c07 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -56,6 +56,32 @@ in
{ Type = "dbus";
BusName = "org.freedesktop.UPower";
ExecStart = "@${cfg.package}/libexec/upowerd upowerd";
+ Restart = "on-failure";
+ # Upstream lockdown:
+ # Filesystem lockdown
+ ProtectSystem = "strict";
+ # Needed by keyboard backlight support
+ ProtectKernelTunables = false;
+ ProtectControlGroups = true;
+ ReadWritePaths = "/var/lib/upower";
+ ProtectHome = true;
+ PrivateTmp = true;
+
+ # Network
+ # PrivateNetwork=true would block udev's netlink socket
+ RestrictAddressFamilies = "AF_UNIX AF_NETLINK";
+
+ # Execute Mappings
+ MemoryDenyWriteExecute = true;
+
+ # Modules
+ ProtectKernelModules = true;
+
+ # Real-time
+ RestrictRealtime = true;
+
+ # Privilege escalation
+ NoNewPrivileges = true;
};
};
diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix
index 8f4f39aa728..fc1267c5d28 100644
--- a/nixos/modules/services/mail/clamsmtp.nix
+++ b/nixos/modules/services/mail/clamsmtp.nix
@@ -176,4 +176,6 @@ in
}
) cfg.instances);
};
+
+ meta.maintainers = with lib.maintainers; [ ekleog ];
}
diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
index 894b88e25c1..f4ac9e47007 100644
--- a/nixos/modules/services/mail/dkimproxy-out.nix
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -115,4 +115,6 @@ in
};
};
};
+
+ meta.maintainers = with lib.maintainers; [ ekleog ];
}
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index e6091182b2a..30ad7d82fb8 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -311,7 +311,7 @@ in
{ name = "dovenull";
uid = config.ids.uids.dovenull2;
description = "Dovecot user for untrusted logins";
- group = cfg.group;
+ group = "dovenull";
}
] ++ optional (cfg.user == "dovecot2")
{ name = "dovecot2";
@@ -332,6 +332,10 @@ in
}
++ optional (cfg.createMailUser && cfg.mailGroup != null)
{ name = cfg.mailGroup;
+ }
+ ++ singleton
+ { name = "dovenull";
+ gid = config.ids.gids.dovenull2;
};
environment.etc."dovecot/modules".source = modulesDir;
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index ff01a5dee53..d83d6f1f750 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -127,11 +127,15 @@ let
options {
pidfile = "$RUNDIR/rspamd.pid";
.include "$CONFDIR/options.inc"
+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc"
+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
}
logging {
type = "syslog";
.include "$CONFDIR/logging.inc"
+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc"
+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
}
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
@@ -149,6 +153,41 @@ let
${cfg.extraConfig}
'';
+ rspamdDir = pkgs.linkFarm "etc-rspamd-dir" (
+ (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) cfg.locals) ++
+ (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) cfg.overrides) ++
+ (optional (cfg.localLuaRules != null) { name = "rspamd.local.lua"; path = cfg.localLuaRules; }) ++
+ [ { name = "rspamd.conf"; path = rspamdConfFile; } ]
+ );
+
+ configFileModule = prefix: { name, config, ... }: {
+ options = {
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether this file ${prefix} should be generated. This
+ option allows specific ${prefix} files to be disabled.
+ '';
+ };
+
+ text = mkOption {
+ default = null;
+ type = types.nullOr types.lines;
+ description = "Text of the file.";
+ };
+
+ source = mkOption {
+ type = types.path;
+ description = "Path of the source file.";
+ };
+ };
+ config = {
+ source = mkIf (config.text != null) (
+ let name' = "rspamd-${prefix}-" + baseNameOf name;
+ in mkDefault (pkgs.writeText name' config.text));
+ };
+ };
in
{
@@ -167,6 +206,41 @@ in
description = "Whether to run the rspamd daemon in debug mode.";
};
+ locals = mkOption {
+ type = with types; loaOf (submodule (configFileModule "locals"));
+ default = {};
+ description = ''
+ Local configuration files, written into /etc/rspamd/local.d/{name}.
+ '';
+ example = literalExample ''
+ { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
+ "arc.conf".text = "allow_envfrom_empty = true;";
+ }
+ '';
+ };
+
+ overrides = mkOption {
+ type = with types; loaOf (submodule (configFileModule "overrides"));
+ default = {};
+ description = ''
+ Overridden configuration files, written into /etc/rspamd/override.d/{name}.
+ '';
+ example = literalExample ''
+ { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
+ "arc.conf".text = "allow_envfrom_empty = true;";
+ }
+ '';
+ };
+
+ localLuaRules = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = ''
+ Path of file to link to /etc/rspamd/rspamd.local.lua for local
+ rules written in Lua
+ '';
+ };
+
workers = mkOption {
type = with types; attrsOf (submodule workerOpts);
description = ''
@@ -242,16 +316,17 @@ in
gid = config.ids.gids.rspamd;
};
- environment.etc."rspamd.conf".source = rspamdConfFile;
+ environment.etc."rspamd".source = rspamdDir;
systemd.services.rspamd = {
description = "Rspamd Service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
+ restartTriggers = [ rspamdDir ];
serviceConfig = {
- ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
+ ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c /etc/rspamd/rspamd.conf -f";
Restart = "always";
RuntimeDirectory = "rspamd";
PrivateTmp = true;
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 8ea831afb7c..aa72cda7045 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -14,15 +14,16 @@ let
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
pgSuperUser = config.services.postgresql.superUser;
- databaseYml = ''
- production:
- adapter: postgresql
- database: ${cfg.databaseName}
- host: ${cfg.databaseHost}
- password: ${cfg.databasePassword}
- username: ${cfg.databaseUsername}
- encoding: utf8
- '';
+ databaseConfig = {
+ production = {
+ adapter = "postgresql";
+ database = cfg.databaseName;
+ host = cfg.databaseHost;
+ password = cfg.databasePassword;
+ username = cfg.databaseUsername;
+ encoding = "utf8";
+ };
+ };
gitalyToml = pkgs.writeText "gitaly.toml" ''
socket_path = "${lib.escape ["\""] gitalySocket}"
@@ -45,35 +46,31 @@ let
'') gitlabConfig.production.repositories.storages))}
'';
- gitlabShellYml = ''
- user: ${cfg.user}
- gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
- http_settings:
- self_signed_cert: false
- repos_path: "${cfg.statePath}/repositories"
- secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
- log_file: "${cfg.statePath}/log/gitlab-shell.log"
- custom_hooks_dir: "${cfg.statePath}/custom_hooks"
- redis:
- bin: ${pkgs.redis}/bin/redis-cli
- host: 127.0.0.1
- port: 6379
- database: 0
- namespace: resque:gitlab
- '';
+ gitlabShellConfig = {
+ user = cfg.user;
+ gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
+ http_settings.self_signed_cert = false;
+ repos_path = "${cfg.statePath}/repositories";
+ secret_file = "${cfg.statePath}/config/gitlab_shell_secret";
+ log_file = "${cfg.statePath}/log/gitlab-shell.log";
+ custom_hooks_dir = "${cfg.statePath}/custom_hooks";
+ redis = {
+ bin = "${pkgs.redis}/bin/redis-cli";
+ host = "127.0.0.1";
+ port = 6379;
+ database = 0;
+ namespace = "resque:gitlab";
+ };
+ };
- redisYml = ''
- production:
- url: redis://localhost:6379/
- '';
+ redisConfig.production.url = "redis://localhost:6379/";
- secretsYml = ''
- production:
- secret_key_base: ${cfg.secrets.secret}
- otp_key_base: ${cfg.secrets.otp}
- db_key_base: ${cfg.secrets.db}
- openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws}
- '';
+ secretsConfig.production = {
+ secret_key_base = cfg.secrets.secret;
+ otp_key_base = cfg.secrets.otp;
+ db_key_base = cfg.secrets.db;
+ openid_connect_signing_key = cfg.secrets.jws;
+ };
gitlabConfig = {
# These are the default settings from config/gitlab.example.yml
@@ -115,12 +112,8 @@ let
upload_pack = true;
receive_pack = true;
};
- workhorse = {
- secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
- };
- git = {
- bin_path = "git";
- };
+ workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
+ git.bin_path = "git";
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
sidekiq_exporter = {
@@ -138,7 +131,7 @@ let
HOME = "${cfg.statePath}/home";
UNICORN_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
- GITLAB_STATE_PATH = "${cfg.statePath}";
+ GITLAB_STATE_PATH = cfg.statePath;
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
SCHEMA = "${cfg.statePath}/db/schema.rb";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
@@ -146,13 +139,11 @@ let
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
- GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml;
+ GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
};
- unicornConfig = builtins.readFile ./defaultUnicornConfig.rb;
-
gitlab-rake = pkgs.stdenv.mkDerivation rec {
name = "gitlab-rake";
buildInputs = [ pkgs.makeWrapper ];
@@ -162,7 +153,6 @@ let
mkdir -p $out/bin
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
- --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
--set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
@@ -306,7 +296,6 @@ in {
initialRootPassword = mkOption {
type = types.str;
- default = "UseNixOS!";
description = ''
Initial password of the root account if this is a new install.
'';
@@ -461,10 +450,30 @@ in {
}
];
+ systemd.tmpfiles.rules = [
+ "d /run/gitlab 0755 ${cfg.user} ${cfg.group} -"
+ "d ${gitlabEnv.HOME} 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.backupPath} 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/shell 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/tmp/pids 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/tmp/sockets 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/uploads 0700 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/custom_hooks/pre-receive.d 0700 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/custom_hooks/post-receive.d 0700 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/custom_hooks/update.d 0700 ${cfg.user} ${cfg.group} -"
+ "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -"
+ "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -"
+ "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -"
+ ];
+
systemd.services.gitlab-sidekiq = {
- after = [ "network.target" "redis.service" ];
+ after = [ "network.target" "redis.service" "gitlab.service" ];
wantedBy = [ "multi-user.target" ];
- partOf = [ "gitlab.service" ];
environment = gitlabEnv;
path = with pkgs; [
config.services.postgresql.package
@@ -486,10 +495,8 @@ in {
};
systemd.services.gitaly = {
- after = [ "network.target" "gitlab.service" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- environment.HOME = gitlabEnv.HOME;
- environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ];
serviceConfig = {
Type = "simple";
@@ -505,8 +512,6 @@ in {
systemd.services.gitlab-workhorse = {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- environment.HOME = gitlabEnv.HOME;
- environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
path = with pkgs; [
gitAndTools.git
gnutar
@@ -514,10 +519,6 @@ in {
openssh
gitlab-workhorse
];
- preStart = ''
- mkdir -p /run/gitlab
- chown ${cfg.user}:${cfg.group} /run/gitlab
- '';
serviceConfig = {
PermissionsStartOnly = true; # preStart must be run as root
Type = "simple";
@@ -538,7 +539,7 @@ in {
};
systemd.services.gitlab = {
- after = [ "network.target" "postgresql.service" "redis.service" ];
+ after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "postgresql.service" "redis.service" ];
requires = [ "gitlab-sidekiq.service" ];
wantedBy = [ "multi-user.target" ];
environment = gitlabEnv;
@@ -551,102 +552,76 @@ in {
gnupg
];
preStart = ''
- mkdir -p ${cfg.backupPath}
- mkdir -p ${cfg.statePath}/builds
- mkdir -p ${cfg.statePath}/repositories
- mkdir -p ${gitlabConfig.production.shared.path}/artifacts
- mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
- mkdir -p ${gitlabConfig.production.shared.path}/pages
- mkdir -p ${cfg.statePath}/log
- mkdir -p ${cfg.statePath}/tmp/pids
- mkdir -p ${cfg.statePath}/tmp/sockets
- mkdir -p ${cfg.statePath}/shell
- mkdir -p ${cfg.statePath}/db
- mkdir -p ${cfg.statePath}/uploads
- mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d
- mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d
- mkdir -p ${cfg.statePath}/custom_hooks/update.d
-
- rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
- mkdir -p ${cfg.statePath}/config
-
- ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
-
- mkdir -p /run/gitlab
- mkdir -p ${cfg.statePath}/log
- [ -d /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
- [ -d /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
- [ -d /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
- ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
- chown -R ${cfg.user}:${cfg.group} /run/gitlab
-
- # Prepare home directory
- mkdir -p ${gitlabEnv.HOME}/.ssh
- touch ${gitlabEnv.HOME}/.ssh/authorized_keys
- chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
-
cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
- cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
- ${optionalString cfg.smtp.enable ''
- ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
- ''}
- ln -sf ${cfg.statePath}/config /run/gitlab/config
+ rm -rf ${cfg.statePath}/config
+ mkdir ${cfg.statePath}/config
if [ -e ${cfg.statePath}/lib ]; then
rm ${cfg.statePath}/lib
fi
- ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
+
+ ln -sf ${cfg.packages.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
+ [ -L /run/gitlab/config ] || ln -sf ${cfg.statePath}/config /run/gitlab/config
+ [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
+ [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+ [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+ ${optionalString cfg.smtp.enable ''
+ ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+ ''}
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+ cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+ ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
# JSON is a subset of YAML
- ln -fs ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
- ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.statePath}/config/database.yml
- ln -fs ${pkgs.writeText "secrets.yml" secretsYml} ${cfg.statePath}/config/secrets.yml
- ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.statePath}/config/unicorn.rb
+ ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
+ ln -sf ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} ${cfg.statePath}/config/database.yml
+ ln -sf ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)} ${cfg.statePath}/config/secrets.yml
+ ln -sf ${./defaultUnicornConfig.rb} ${cfg.statePath}/config/unicorn.rb
+
+ # Install the shell required to push repositories
+ ln -sf ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)} /run/gitlab/shell-config.yml
+ [ -L ${cfg.statePath}/shell/hooks ] || ln -sf ${cfg.packages.gitlab-shell}/hooks ${cfg.statePath}/shell/hooks
+ ${cfg.packages.gitlab-shell}/bin/install
chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
+ chown -R ${cfg.user}:${cfg.group} /run/gitlab
- # Install the shell required to push repositories
- ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} "$GITLAB_SHELL_CONFIG_PATH"
- ln -fs ${cfg.packages.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
- ${cfg.packages.gitlab-shell}/bin/install
-
- if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
- if ! test -e "${cfg.statePath}/db-created"; then
+ if ! test -e "${cfg.statePath}/db-created"; then
+ if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
- touch "${cfg.statePath}/db-created"
+
+ # enable required pg_trgm extension for gitlab
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
fi
- # enable required pg_trgm extension for gitlab
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load
+
+ touch "${cfg.statePath}/db-created"
fi
# Always do the db migrations just to be sure the database is up-to-date
- ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:migrate
- # The gitlab:setup task is horribly broken somehow, the db:migrate
- # task above and the db:seed_fu below will do the same for setting
- # up the initial database
if ! test -e "${cfg.statePath}/db-seeded"; then
- ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \
GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
touch "${cfg.statePath}/db-seeded"
fi
# The gitlab:shell:setup regenerates the authorized_keys file so that
# the store path to the gitlab-shell in it gets updated
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup RAILS_ENV=production
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup
# The gitlab:shell:create_hooks task seems broken for fixing links
# so we instead delete all the hooks and create them anew
rm -f ${cfg.statePath}/repositories/**/*.git/hooks
- ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks
+
+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input"
# Change permissions in the last step because some of the
# intermediary scripts like to create directories as root.
- chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
- chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
chmod -R ug-s ${cfg.statePath}/repositories
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 0756e81612a..2e9aa33aeee 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -157,6 +157,7 @@ in {
Restart = "on-failure";
ProtectSystem = "strict";
ReadWritePaths = "${cfg.configDir}";
+ KillSignal = "SIGINT";
PrivateTmp = true;
RemoveIPC = true;
};
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 8fd3455a238..5434fe99347 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -7,7 +7,7 @@ let
ddConf = {
dd_url = "https://app.datadoghq.com";
- skip_ssl_validation = "no";
+ skip_ssl_validation = false;
confd_path = "/etc/datadog-agent/conf.d";
additional_checksd = "/etc/datadog-agent/checks.d";
use_dogstatsd = true;
@@ -16,6 +16,7 @@ let
// optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
// optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
// optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
+ // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; }
// cfg.extraConfig;
# Generate Datadog configuration files for each configured checks.
@@ -132,6 +133,15 @@ in {
default = false;
type = types.bool;
};
+
+ enableTraceAgent = mkOption {
+ description = ''
+ Whether to enable the trace agent.
+ '';
+ default = false;
+ type = types.bool;
+ };
+
checks = mkOption {
description = ''
Configuration for all Datadog checks. Keys of this attribute
@@ -244,6 +254,16 @@ in {
${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
'';
});
+
+ datadog-trace-agent = lib.mkIf cfg.enableTraceAgent (makeService {
+ description = "Datadog Trace Agent";
+ path = [ ];
+ script = ''
+ export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
+ ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
+ '';
+ });
+
};
environment.etc = etcfiles;
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
new file mode 100644
index 00000000000..1de0a8d5af2
--- /dev/null
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -0,0 +1,154 @@
+{ options, config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.kapacitor;
+
+ kapacitorConf = pkgs.writeTextFile {
+ name = "kapacitord.conf";
+ text = ''
+ hostname="${config.networking.hostName}"
+ data_dir="${cfg.dataDir}"
+
+ [http]
+ bind-address = "${cfg.bind}:${toString cfg.port}"
+ log-enabled = false
+ auth-enabled = false
+
+ [task]
+ dir = "${cfg.dataDir}/tasks"
+ snapshot-interval = "${cfg.taskSnapshotInterval}"
+
+ [replay]
+ dir = "${cfg.dataDir}/replay"
+
+ [storage]
+ boltdb = "${cfg.dataDir}/kapacitor.db"
+
+ ${optionalString (cfg.loadDirectory != null) ''
+ [load]
+ enabled = true
+ dir = "${cfg.loadDirectory}"
+ ''}
+
+ ${optionalString (cfg.defaultDatabase.enable) ''
+ [[influxdb]]
+ name = "default"
+ enabled = true
+ default = true
+ urls = [ "${cfg.defaultDatabase.url}" ]
+ username = "${cfg.defaultDatabase.username}"
+ password = "${cfg.defaultDatabase.password}"
+ ''}
+
+ ${cfg.extraConfig}
+ '';
+ };
+in
+{
+ options.services.kapacitor = {
+ enable = mkEnableOption "kapacitor";
+
+ dataDir = mkOption {
+ type = types.path;
+ example = "/var/lib/kapacitor";
+ default = "/var/lib/kapacitor";
+ description = "Location where Kapacitor stores its state";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 9092;
+ description = "Port of Kapacitor";
+ };
+
+ bind = mkOption {
+ type = types.str;
+ default = "";
+ example = literalExample "0.0.0.0";
+ description = "Address to bind to. The default is to bind to all addresses";
+ };
+
+ extraConfig = mkOption {
+ description = "These lines go into kapacitord.conf verbatim.";
+ default = "";
+ type = types.lines;
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "kapacitor";
+ description = "User account under which Kapacitor runs";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "kapacitor";
+ description = "Group under which Kapacitor runs";
+ };
+
+ taskSnapshotInterval = mkOption {
+ type = types.str;
+ description = "Specifies how often to snapshot the task state (in InfluxDB time units)";
+ default = "1m0s";
+ example = "1m0s";
+ };
+
+ loadDirectory = mkOption {
+ type = types.nullOr types.path;
+ description = "Directory where to load services from, such as tasks, templates and handlers (or null to disable service loading on startup)";
+ default = null;
+ };
+
+ defaultDatabase = {
+ enable = mkEnableOption "kapacitor.defaultDatabase";
+
+ url = mkOption {
+ description = "The URL to an InfluxDB server that serves as the default database";
+ example = "http://localhost:8086";
+ type = types.string;
+ };
+
+ username = mkOption {
+ description = "The username to connect to the remote InfluxDB server";
+ type = types.string;
+ };
+
+ password = mkOption {
+ description = "The password to connect to the remote InfluxDB server";
+ type = types.string;
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.kapacitor ];
+
+ systemd.services.kapacitor = {
+ description = "Kapacitor Real-Time Stream Processing Engine";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "networking.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";
+ User = "kapacitor";
+ Group = "kapacitor";
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -p ${cfg.dataDir}
+ chown ${cfg.user}:${cfg.group} ${cfg.dataDir}
+ '';
+ };
+
+ users.users.kapacitor = {
+ uid = config.ids.uids.kapacitor;
+ description = "Kapacitor user";
+ home = cfg.dataDir;
+ };
+
+ users.groups.kapacitor = {
+ gid = config.ids.gids.kapacitor;
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index e2ee995cea8..bf4dfc666bb 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -10,6 +10,13 @@ let
# Get a submodule without any embedded metadata:
_filter = x: filterAttrs (k: v: k != "_module") x;
+ # a wrapper that verifies that the configuration is valid
+ promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked"
+ { buildInputs = [ cfg.package ]; } ''
+ ln -s ${file} $out
+ promtool ${what} $out
+ '';
+
# Pretty-print JSON to a file
writePrettyJSON = name: x:
pkgs.runCommand name { } ''
@@ -19,18 +26,19 @@ let
# This becomes the main config file
promConfig = {
global = cfg.globalConfig;
- rule_files = cfg.ruleFiles ++ [
+ rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [
(pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
- ];
+ ]);
scrape_configs = cfg.scrapeConfigs;
};
generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
- prometheusYml =
- if cfg.configText != null then
+ prometheusYml = let
+ yml = if cfg.configText != null then
pkgs.writeText "prometheus.yml" cfg.configText
- else generatedPrometheusYml;
+ else generatedPrometheusYml;
+ in promtoolCheck "check-config" "prometheus.yml" yml;
cmdlineArgs = cfg.extraFlags ++ [
"-storage.local.path=${cfg.dataDir}/metrics"
@@ -376,6 +384,15 @@ in {
'';
};
+ package = mkOption {
+ type = types.package;
+ default = pkgs.prometheus;
+ defaultText = "pkgs.prometheus";
+ description = ''
+ The prometheus package that should be used.
+ '';
+ };
+
listenAddress = mkOption {
type = types.str;
default = "0.0.0.0:9090";
@@ -495,7 +512,7 @@ in {
after = [ "network.target" ];
script = ''
#!/bin/sh
- exec ${pkgs.prometheus}/bin/prometheus \
+ exec ${cfg.package}/bin/prometheus \
${concatStringsSep " \\\n " cmdlineArgs}
'';
serviceConfig = {
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 46e3b745761..274b3617160 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -33,7 +33,7 @@ let
purple_plugin_path =
lib.concatMapStringsSep ":"
- (plugin: "${plugin}/lib/pidgin/")
+ (plugin: "${plugin}/lib/pidgin/:${plugin}/lib/purple-2/")
cfg.libpurple_plugins
;
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index a363b545d64..9b8005e706a 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -93,6 +93,8 @@ in
services.timesyncd.enable = mkForce false;
+ systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; };
+
systemd.services.chronyd =
{ description = "chrony NTP daemon";
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index ab3f8103768..0e90fed788b 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -6,9 +6,10 @@ let
dataDir = "/var/lib/consul";
cfg = config.services.consul;
- configOptions = { data_dir = dataDir; } //
- (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) //
- cfg.extraConfig;
+ configOptions = {
+ data_dir = dataDir;
+ ui = cfg.webUi;
+ } // cfg.extraConfig;
configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
++ cfg.extraConfigFiles;
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 9a2e13e9553..a70967820b3 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -182,9 +182,10 @@ with lib;
serviceConfig = rec {
DynamicUser = true;
RuntimeDirectory = StateDirectory;
+ RuntimeDirectoryMode = "0750";
StateDirectory = builtins.baseNameOf dataDir;
Type = "oneshot";
- ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf";
+ ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m660 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf";
ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";
};
};
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
new file mode 100644
index 00000000000..be7337ece7e
--- /dev/null
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.eternal-terminal;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.eternal-terminal = {
+
+ enable = mkEnableOption "Eternal Terminal server";
+
+ port = mkOption {
+ default = 2022;
+ type = types.int;
+ description = ''
+ The port the server should listen on. Will use the server's default (2022) if not specified.
+ '';
+ };
+
+ verbosity = mkOption {
+ default = 0;
+ type = types.enum (lib.range 0 9);
+ description = ''
+ The verbosity level (0-9).
+ '';
+ };
+
+ silent = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ If enabled, disables all logging.
+ '';
+ };
+
+ logSize = mkOption {
+ default = 20971520;
+ type = types.int;
+ description = ''
+ The maximum log size.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ # We need to ensure the et package is fully installed because
+ # the (remote) et client runs the `etterminal` binary when it
+ # connects.
+ environment.systemPackages = [ pkgs.eternal-terminal ];
+
+ systemd.services = {
+ eternal-terminal = {
+ description = "Eternal Terminal server.";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "syslog.target" "network.target" ];
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" ''
+ ; et.cfg : Config file for Eternal Terminal
+ ;
+
+ [Networking]
+ port = ${toString cfg.port}
+
+ [Debug]
+ verbose = ${toString cfg.verbosity}
+ silent = ${if cfg.silent then "1" else "0"}
+ logsize = ${toString cfg.logSize}
+ ''}";
+ Restart = "on-failure";
+ KillMode = "process";
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 342350d49ab..32174100b0f 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -67,6 +67,8 @@ in
environment.systemPackages = [ pkgs.ntp ];
services.timesyncd.enable = mkForce false;
+ systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };
+
users.users = singleton
{ name = ntpUser;
uid = config.ids.uids.ntp;
diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix
index a47a78f1005..8481f9debf3 100644
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixos/modules/services/networking/redsocks.nix
@@ -267,4 +267,6 @@ in
"ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true"
) cfg.redsocks;
};
+
+ meta.maintainers = with lib.maintainers; [ ekleog ];
}
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index b16d299917f..d4f7e95f859 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -248,6 +248,14 @@ in {
'';
+ ppk_id = mkOptionalStrParam ''
+ String identifying the Postquantum Preshared Key (PPK) to be used.
+ '';
+
+ ppk_required = mkYesNoParam no ''
+ Whether a Postquantum Preshared Key (PPK) is required for this connection.
+ '';
+
keyingtries = mkIntParam 1 ''
Number of retransmission sequences to perform during initial
connect. Instead of giving up initiation after the first retransmission
@@ -922,6 +930,36 @@ in {
0xffffffff.
'';
+ set_mark_in = mkStrParam "0/0x00000000" ''
+ Netfilter mark applied to packets after the inbound IPsec SA processed
+ them. This way it's not necessary to mark packets via Netfilter before
+ decryption or right afterwards to match policies or process them
+ differently (e.g. via policy routing).
+
+ An additional mask may be appended to the mark, separated by
+ /. The default mask if omitted is 0xffffffff. The
+ special value %same uses the value (but not the mask)
+ from as mark value, which can be fixed,
+ %unique or %unique-dir.
+
+ Setting marks in XFRM input requires Linux 4.19 or higher.
+ '';
+
+ set_mark_out = mkStrParam "0/0x00000000" ''
+ Netfilter mark applied to packets after the outbound IPsec SA processed
+ them. This allows processing ESP packets differently than the original
+ traffic (e.g. via policy routing).
+
+ An additional mask may be appended to the mark, separated by
+ /. The default mask if omitted is 0xffffffff. The
+ special value %same uses the value (but not the mask)
+ from as mark value, which can be fixed,
+ %unique_ or %unique-dir.
+
+ Setting marks in XFRM output is supported since Linux 4.14. Setting a
+ mask requires at least Linux 4.19.
+ '';
+
tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 ''
Pads ESP packets with additional data to have a consistent ESP packet
size for improved Traffic Flow Confidentiality. The padding defines the
@@ -946,6 +984,33 @@ in {
supported, but the installation does not fail otherwise.
'';
+ copy_df = mkYesNoParam yes ''
+ Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This
+ effectively disables Path MTU discovery (PMTUD). Controlling this
+ behavior is not supported by all kernel interfaces.
+ '';
+
+ copy_ecn = mkYesNoParam yes ''
+ Whether to copy the ECN (Explicit Congestion Notification) header field
+ to/from the outer IP header in tunnel mode. Controlling this behavior is
+ not supported by all kernel interfaces.
+ '';
+
+ copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" ''
+ Whether to copy the DSCP (Differentiated Services Field Codepoint)
+ header field to/from the outer IP header in tunnel mode. The value
+ out only copies the field from the inner to the outer
+ header, the value in does the opposite and only
+ copies the field from the outer to the inner header when decapsulating,
+ the value yes copies the field in both directions,
+ and the value no disables copying the field
+ altogether. Setting this to yes or
+ in could allow an attacker to adversely affect other
+ traffic at the receiver, which is why the default is
+ out. Controlling this behavior is not supported by
+ all kernel interfaces.
+ '';
+
start_action = mkEnumParam ["none" "trap" "start"] "none" ''
Action to perform after loading the configuration.
@@ -1060,6 +1125,24 @@ in {
defined in a unique section having the ike prefix.
'';
+ ppk = mkPrefixedAttrsOfParams {
+ secret = mkOptionalStrParam ''
+ Value of the PPK. It may either be an ASCII string, a hex encoded string
+ if it has a 0x prefix or a Base64 encoded string if
+ it has a 0s prefix in its value. Should have at least
+ 256 bits of entropy for 128-bit security.
+ '';
+
+ id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
+ PPK identity the PPK belongs to. Multiple unique identities may be
+ specified, each having an id prefix, if a secret is
+ shared between multiple peers.
+ '';
+ } ''
+ Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
+ defined in a unique section having the ppk prefix.
+ '';
+
private = mkPrefixedAttrsOfParams {
file = mkOptionalStrParam ''
File name in the private folder for which this passphrase should be used.
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index fd31b2a6768..b2ef1885a95 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -62,9 +62,21 @@ in {
dataDir = mkOption {
type = types.path;
default = "/var/lib/syncthing";
+ description = ''
+ Path where synced directories will exist.
+ '';
+ };
+
+ configDir = mkOption {
+ type = types.path;
description = ''
Path where the settings and keys will exist.
'';
+ default =
+ let
+ nixos = config.system.stateVersion;
+ cond = versionAtLeast nixos "19.03";
+ in cfg.dataDir + (optionalString cond "/.config/syncthing");
};
openDefaultPorts = mkOption {
@@ -144,7 +156,7 @@ in {
${cfg.package}/bin/syncthing \
-no-browser \
-gui-address=${cfg.guiAddress} \
- -home=${cfg.dataDir}
+ -home=${cfg.configDir}
'';
};
};
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index a4cd368397e..764af3846fe 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -39,7 +39,8 @@ in
systemd.services.zerotierone = {
description = "ZeroTierOne";
path = [ cfg.package ];
- after = [ "network.target" ];
+ bindsTo = [ "network-online.target" ];
+ after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
mkdir -p /var/lib/zerotier-one/networks.d
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 90140a337ed..7200c40e89f 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -6,142 +6,105 @@ let
cfg = config.services.solr;
- # Assemble all jars needed for solr
- solrJars = pkgs.stdenv.mkDerivation {
- name = "solr-jars";
-
- src = pkgs.fetchurl {
- url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz;
- sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
- };
-
- installPhase = ''
- mkdir -p $out/lib
- cp common/lib/*.jar $out/lib/
- ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
- ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
- ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/
- '' + optionalString (cfg.extraJars != []) ''
- for f in ${concatStringsSep " " cfg.extraJars}; do
- cp $f $out/lib
- done
- '';
- };
-
-in {
+in
+{
options = {
services.solr = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enables the solr service.
- '';
- };
+ enable = mkEnableOption "Enables the solr service.";
- javaPackage = mkOption {
- type = types.package;
- default = pkgs.jre;
- defaultText = "pkgs.jre";
- description = ''
- Which Java derivation to use for running solr.
- '';
- };
-
- solrPackage = mkOption {
+ package = mkOption {
type = types.package;
default = pkgs.solr;
defaultText = "pkgs.solr";
- description = ''
- Which solr derivation to use for running solr.
- '';
+ description = "Which Solr package to use.";
};
- extraJars = mkOption {
- type = types.listOf types.path;
- default = [];
- description = ''
- List of paths pointing to jars. Jars are copied to commonLibFolder to be available to java/solr.
- '';
+ port = mkOption {
+ type = types.int;
+ default = 8983;
+ description = "Port on which Solr is ran.";
};
- log4jConfiguration = mkOption {
- type = types.lines;
- default = ''
- log4j.rootLogger=INFO, stdout
- log4j.appender.stdout=org.apache.log4j.ConsoleAppender
- log4j.appender.stdout.Target=System.out
- log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
- log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
- '';
- description = ''
- Contents of the log4j.properties used. By default,
- everything is logged to stdout (picked up by systemd) with level INFO.
- '';
- };
-
- user = mkOption {
- type = types.str;
- description = ''
- The user that should run the solr process and.
- the working directories.
- '';
- };
-
- group = mkOption {
- type = types.str;
- description = ''
- The group that will own the working directory.
- '';
- };
-
- solrHome = mkOption {
- type = types.str;
- description = ''
- The solr home directory. It is your own responsibility to
- make sure this directory contains a working solr configuration,
- and is writeable by the the user running the solr service.
- Failing to do so, the solr will not start properly.
- '';
+ stateDir = mkOption {
+ type = types.path;
+ default = "/var/lib/solr";
+ description = "The solr home directory containing config, data, and logging files.";
};
extraJavaOptions = mkOption {
type = types.listOf types.str;
default = [];
- description = ''
- Extra command line options given to the java process running
- solr.
- '';
+ description = "Extra command line options given to the java process running Solr.";
};
- extraWinstoneOptions = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra command line options given to the Winstone, which is
- the servlet container hosting solr.
- '';
+ user = mkOption {
+ type = types.str;
+ default = "solr";
+ description = "User under which Solr is ran.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "solr";
+ description = "Group under which Solr is ran.";
};
};
};
config = mkIf cfg.enable {
- services.winstone.solr = {
- serviceName = "solr";
- inherit (cfg) user group javaPackage;
- warFile = "${cfg.solrPackage}/lib/solr.war";
- extraOptions = [
- "--commonLibFolder=${solrJars}/lib"
- "--useJasper"
- ] ++ cfg.extraWinstoneOptions;
- extraJavaOptions = [
- "-Dsolr.solr.home=${cfg.solrHome}"
- "-Dlog4j.configuration=file://${pkgs.writeText "log4j.properties" cfg.log4jConfiguration}"
- ] ++ cfg.extraJavaOptions;
+ environment.systemPackages = [ cfg.package ];
+
+ systemd.services.solr = {
+ after = [ "network.target" "remote-fs.target" "nss-lookup.target" "systemd-journald-dev-log.socket" ];
+ wantedBy = [ "multi-user.target" ];
+
+ environment = {
+ SOLR_HOME = "${cfg.stateDir}/data";
+ LOG4J_PROPS = "${cfg.stateDir}/log4j2.xml";
+ SOLR_LOGS_DIR = "${cfg.stateDir}/logs";
+ SOLR_PORT = "${toString cfg.port}";
+ };
+ path = with pkgs; [
+ gawk
+ procps
+ ];
+ preStart = ''
+ mkdir -p "${cfg.stateDir}/data";
+ mkdir -p "${cfg.stateDir}/logs";
+
+ if ! test -e "${cfg.stateDir}/data/solr.xml"; then
+ install -D -m0640 ${cfg.package}/server/solr/solr.xml "${cfg.stateDir}/data/solr.xml"
+ install -D -m0640 ${cfg.package}/server/solr/zoo.cfg "${cfg.stateDir}/data/zoo.cfg"
+ fi
+
+ if ! test -e "${cfg.stateDir}/log4j2.xml"; then
+ install -D -m0640 ${cfg.package}/server/resources/log4j2.xml "${cfg.stateDir}/log4j2.xml"
+ fi
+ '';
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart="${cfg.package}/bin/solr start -f -a \"${concatStringsSep " " cfg.extraJavaOptions}\"";
+ ExecStop="${cfg.package}/bin/solr stop";
+ };
};
+ users.users = optionalAttrs (cfg.user == "solr") (singleton
+ { name = "solr";
+ group = cfg.group;
+ home = cfg.stateDir;
+ createHome = true;
+ uid = config.ids.uids.solr;
+ });
+
+ users.groups = optionalAttrs (cfg.group == "solr") (singleton
+ { name = "solr";
+ gid = config.ids.gids.solr;
+ });
+
};
}
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index db4c8e1a3d8..c7e97bbeba9 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -70,7 +70,15 @@ in {
'';
};
- nginx.enable = mkEnableOption "nginx vhost management";
+ nginx.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable nginx virtual host management.
+ Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>.
+ See for further information.
+ '';
+ };
webfinger = mkOption {
type = types.bool;
@@ -184,7 +192,7 @@ in {
type = types.nullOr types.str;
default = null;
description = ''
- Database password. Use adminpassFile to avoid this
+ Admin password. Use adminpassFile to avoid this
being world-readable in the /nix/store.
'';
};
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 508398f03ac..6c733f093ba 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -46,7 +46,7 @@ let
configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group};
- error_log stderr;
+ error_log ${cfg.logError};
daemon off;
${cfg.config}
@@ -341,6 +341,35 @@ in
";
};
+ logError = mkOption {
+ default = "stderr";
+ description = "
+ Configures logging.
+ The first parameter defines a file that will store the log. The
+ special value stderr selects the standard error file. Logging to
+ syslog can be configured by specifying the “syslog:” prefix.
+ The second parameter determines the level of logging, and can be
+ one of the following: debug, info, notice, warn, error, crit,
+ alert, or emerg. Log levels above are listed in the order of
+ increasing severity. Setting a certain log level will cause all
+ messages of the specified and more severe log levels to be logged.
+ If this parameter is omitted then error is used.
+ ";
+ };
+
+ preStart = mkOption {
+ type = types.lines;
+ default = ''
+ test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs
+ test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir}
+ test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs
+ chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+ '';
+ description = "
+ Shell commands executed before the service's nginx is started.
+ ";
+ };
+
config = mkOption {
default = "";
description = "
@@ -608,9 +637,7 @@ in
stopIfChanged = false;
preStart =
''
- mkdir -p ${cfg.stateDir}/logs
- chmod 700 ${cfg.stateDir}
- chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+ ${cfg.preStart}
${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t
'';
serviceConfig = {
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index be54e9255c7..68261c50324 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -31,10 +31,26 @@ in
'';
};
+ purifyOnStart = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ On startup, the `baseDir` directory is populated with various files,
+ subdirectories and symlinks. If this option is enabled, these items
+ (except for the `logs` and `work` subdirectories) are first removed.
+ This prevents interference from remainders of an old configuration
+ (libraries, webapps, etc.), so it's recommended to enable this option.
+ '';
+ };
+
baseDir = mkOption {
type = lib.types.path;
default = "/var/tomcat";
- description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+ description = ''
+ Location where Tomcat stores configuration files, web applications
+ and logfiles. Note that it is partially cleared on each service startup
+ if `purifyOnStart` is enabled.
+ '';
};
logDirs = mkOption {
@@ -197,6 +213,15 @@ in
after = [ "network.target" ];
preStart = ''
+ ${lib.optionalString cfg.purifyOnStart ''
+ # Delete most directories/symlinks we create from the existing base directory,
+ # to get rid of remainders of an old configuration.
+ # The list of directories to delete is taken from the "mkdir" command below,
+ # excluding "logs" (because logs are valuable) and "work" (because normally
+ # session files are there), and additionally including "bin".
+ rm -rf ${cfg.baseDir}/{conf,virtualhosts,temp,lib,shared/lib,webapps,bin}
+ ''}
+
# Create the base directory
mkdir -p \
${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
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 013956c0546..d1ee076e918 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -22,7 +22,7 @@ let
# This wrapper ensures that we actually get themes
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \
- --prefix PATH : "${pkgs.glibc.bin}/bin" \
+ --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \
--set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
--set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
--set GTK_EXE_PREFIX "${theme}" \
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index b1eaf018956..74c150a848d 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -21,7 +21,8 @@ let
[ coreutils
gnugrep
findutils
- glibc # needed for getent
+ getent
+ stdenv.cc.libc # nscd in update-users-groups.pl
shadow
nettools # needed for hostname
utillinux # needed for mount and mountpoint
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index f4cf9753c0a..e7167999a6f 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -147,7 +147,7 @@ let
${config.boot.initrd.extraUtilsCommands}
# Copy ld manually since it isn't detected correctly
- cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib
+ cp -pv ${pkgs.stdenv.cc.libc.out}/lib/ld*.so.? $out/lib
# Copy all of the needed libraries
find $out/bin $out/lib -type f | while read BIN; do
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index f4fa0969453..4f538ccdbbe 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -112,6 +112,7 @@ in {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];
+ systemd.targets."multi-user".wants = [ "machines.target "];
};
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a1412bc3290..89f8e815355 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -387,7 +387,7 @@ let
logindHandlerType = types.enum [
"ignore" "poweroff" "reboot" "halt" "kexec" "suspend"
- "hibernate" "hybrid-sleep" "lock"
+ "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock"
];
in
@@ -587,6 +587,15 @@ in
'';
};
+ services.journald.forwardToSyslog = mkOption {
+ default = config.services.rsyslogd.enable || config.services.syslog-ng.enable;
+ defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable";
+ type = types.bool;
+ description = ''
+ Whether to forward log messages to syslog.
+ '';
+ };
+
services.logind.extraConfig = mkOption {
default = "";
type = types.lines;
@@ -754,6 +763,9 @@ in
ForwardToConsole=yes
TTYPath=${config.services.journald.console}
''}
+ ${optionalString (config.services.journald.forwardToSyslog) ''
+ ForwardToSyslog=yes
+ ''}
${config.services.journald.extraConfig}
'';
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index c92570582f2..9015200beea 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -53,7 +53,7 @@ let cfg = config.ec2; in
# Mount all formatted ephemeral disks and activate all swap devices.
# We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
# because the set of devices is dependent on the instance type
- # (e.g. "m1.large" has one ephemeral filesystem and one swap device,
+ # (e.g. "m1.small" has one ephemeral filesystem and one swap device,
# while "m1.large" has two ephemeral filesystems and no swap
# devices). Also, put /tmp and /var on /disk0, since it has a lot
# more space than the root device. Similarly, "move" /nix to /disk0
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 8fe59badd33..2fcc0f25425 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -243,6 +243,9 @@ let
Restart = "on-failure";
+ Slice = "machine.slice";
+ Delegate = true;
+
# Hack: we don't want to kill systemd-nspawn, since we call
# "machinectl poweroff" in preStop to shut down the
# container cleanly. But systemd requires sending a signal
@@ -606,7 +609,7 @@ in
{ config =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql96;
+ services.postgresql.package = pkgs.postgresql_9_6;
system.stateVersion = "17.03";
};
@@ -657,6 +660,8 @@ in
serviceConfig = serviceDirectives dummyConfig;
};
in {
+ systemd.targets."multi-user".wants = [ "machines.target" ];
+
systemd.services = listToAttrs (filter (x: x.value != null) (
# The generic container template used by imperative containers
[{ name = "container@"; value = unit; }]
@@ -680,7 +685,7 @@ in
} // (
if config.autoStart then
{
- wantedBy = [ "multi-user.target" ];
+ wantedBy = [ "machines.target" ];
wants = [ "network.target" ];
after = [ "network.target" ];
restartTriggers = [ config.path ];
diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixos/modules/virtualisation/docker-preloader.nix
new file mode 100644
index 00000000000..faa94f53d98
--- /dev/null
+++ b/nixos/modules/virtualisation/docker-preloader.nix
@@ -0,0 +1,135 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with builtins;
+
+let
+ cfg = config.virtualisation;
+
+ sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName;
+ hash = drv: head (split "-" (baseNameOf drv.outPath));
+ # The label of an ext4 FS is limited to 16 bytes
+ labelFromImage = image: substring 0 16 (hash image);
+
+ # The Docker image is loaded and some files from /var/lib/docker/
+ # are written into a qcow image.
+ preload = image: pkgs.vmTools.runInLinuxVM (
+ pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" {
+ buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ];
+ preVM = pkgs.vmTools.createEmptyImage {
+ size = cfg.dockerPreloader.qcowSize;
+ fullName = "docker-deamon-image.qcow2";
+ };
+ }
+ ''
+ mkfs.ext4 /dev/vda
+ e2label /dev/vda ${labelFromImage image}
+ mkdir -p /var/lib/docker
+ mount -t ext4 /dev/vda /var/lib/docker
+
+ modprobe overlay
+
+ # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
+ mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
+ cd /sys/fs/cgroup
+ for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
+ mkdir -p $sys
+ if ! mountpoint -q $sys; then
+ if ! mount -n -t cgroup -o $sys cgroup $sys; then
+ rmdir $sys || true
+ fi
+ fi
+ done
+
+ dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
+
+ until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
+ printf '.'
+ sleep 1
+ done
+
+ docker load -i ${image}
+
+ kill %1
+ find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf
+ '');
+
+ preloadedImages = map preload cfg.dockerPreloader.images;
+
+in
+
+{
+ options.virtualisation.dockerPreloader = {
+ images = mkOption {
+ default = [ ];
+ type = types.listOf types.package;
+ description =
+ ''
+ A list of Docker images to preload (in the /var/lib/docker directory).
+ '';
+ };
+ qcowSize = mkOption {
+ default = 1024;
+ type = types.int;
+ description =
+ ''
+ The size (MB) of qcow files.
+ '';
+ };
+ };
+
+ config = {
+ assertions = [{
+ # If docker.storageDriver is null, Docker choose the storage
+ # driver. So, in this case, we cannot be sure overlay2 is used.
+ assertion = cfg.dockerPreloader.images == []
+ || cfg.docker.storageDriver == "overlay2"
+ || cfg.docker.storageDriver == "overlay"
+ || cfg.docker.storageDriver == null;
+ message = "The Docker image Preloader only works with overlay2 storage driver!";
+ }];
+
+ virtualisation.qemu.options =
+ map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2")
+ preloadedImages;
+
+
+ # All attached QCOW files are mounted and their contents are linked
+ # to /var/lib/docker/ in order to make image available.
+ systemd.services.docker-preloader = {
+ description = "Preloaded Docker images";
+ wantedBy = ["docker.service"];
+ after = ["network.target"];
+ path = with pkgs; [ mount rsync jq ];
+ script = ''
+ mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2
+ echo '{}' > /tmp/repositories.json
+
+ for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do
+ mkdir -p /mnt/docker-images/$i
+
+ # The ext4 label is limited to 16 bytes
+ mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i
+
+ find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\
+ -exec ln -s '{}' /var/lib/docker/overlay2/ \;
+ cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/
+
+ rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/
+
+ # Accumulate image definitions
+ cp /tmp/repositories.json /tmp/repositories.json.tmp
+ jq -s '.[0] * .[1]' \
+ /tmp/repositories.json.tmp \
+ /mnt/docker-images/$i/image/overlay2/repositories.json \
+ > /tmp/repositories.json
+ done
+
+ mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json
+ '';
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index caaf6c0aa59..795858e5eae 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -144,7 +144,6 @@ in
path = with pkgs; [ iproute ];
serviceConfig = {
ExecStart = "${gce}/bin/google_network_daemon --debug";
- Type = "oneshot";
};
};
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 3e38662f5b0..f4d7af1664a 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -196,6 +196,8 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ coreutils libvirt gawk ];
restartIfChanged = false;
+
+ environment.ON_SHUTDOWN = "${cfg.onShutdown}";
};
systemd.sockets.virtlogd = {
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 36ca7f356d4..4e0f2cae299 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -64,7 +64,7 @@ in
};
hardware.opengl.package = prl-tools;
- hardware.opengl.package32 = pkgs_i686.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; };
+ hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; };
services.udev.packages = [ prl-tools ];
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4e9c87222d0..ed3431554be 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -185,7 +185,10 @@ let
in
{
- imports = [ ../profiles/qemu-guest.nix ];
+ imports = [
+ ../profiles/qemu-guest.nix
+ ./docker-preloader.nix
+ ];
options = {
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 60048911658..037c0d2f0d8 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -12,7 +12,7 @@ in {
virtualbox = {
baseImageSize = mkOption {
type = types.int;
- default = 10 * 1024;
+ default = 50 * 1024;
description = ''
The size of the VirtualBox base image in MiB.
'';
@@ -61,7 +61,7 @@ in {
export HOME=$PWD
export PATH=${pkgs.virtualbox}/bin:$PATH
- echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..."
+ echo "creating VirtualBox pass-through disk wrapper (no copying involved)..."
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
echo "creating VirtualBox VM..."
@@ -72,9 +72,9 @@ in {
--memory ${toString cfg.memorySize} --acpi on --vram 32 \
${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
--nictype1 virtio --nic1 nat \
- --audiocontroller ac97 --audio alsa \
+ --audiocontroller ac97 --audio alsa --audioout on \
--rtcuseutc on \
- --usb on --mouse usbtablet
+ --usb on --usbehci on --mouse usbtablet
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
--medium disk.vmdk
@@ -82,7 +82,7 @@ in {
echo "exporting VirtualBox VM..."
mkdir -p $out
fn="$out/${cfg.vmFileName}"
- VBoxManage export "$vmName" --output "$fn"
+ VBoxManage export "$vmName" --output "$fn" --options manifest
rm -v $diskImage
diff --git a/nixos/release.nix b/nixos/release.nix
index 5412080cca1..4647f28be18 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -283,6 +283,7 @@ in rec {
tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {};
tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {};
+ tests.docker-preloader = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-preloader.nix {};
tests.docker-registry = callTest tests/docker-registry.nix {};
tests.dovecot = callTest tests/dovecot.nix {};
tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
@@ -300,7 +301,7 @@ in rec {
tests.fsck = callTest tests/fsck.nix {};
tests.fwupd = callTest tests/fwupd.nix {};
tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
- #tests.gitlab = callTest tests/gitlab.nix {};
+ tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
tests.gjs = callTest tests/gjs.nix {};
tests.gocd-agent = callTest tests/gocd-agent.nix {};
@@ -399,6 +400,7 @@ in rec {
tests.radicale = callTest tests/radicale.nix {};
tests.redmine = callTest tests/redmine.nix {};
tests.rspamd = callSubTests tests/rspamd.nix {};
+ tests.rsyslogd = callSubTests tests/rsyslogd.nix {};
tests.runInMachine = callTest tests/run-in-machine.nix {};
tests.rxe = callTest tests/rxe.nix {};
tests.samba = callTest tests/samba.nix {};
@@ -408,6 +410,7 @@ in rec {
tests.slurm = callTest tests/slurm.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.snapper = callTest tests/snapper.nix {};
+ tests.solr = callTest tests/solr.nix {};
#tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946
tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {};
tests.sudo = callTest tests/sudo.nix {};
@@ -467,7 +470,7 @@ in rec {
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql93;
+ services.postgresql.package = pkgs.postgresql_9_3;
environment.systemPackages = [ pkgs.php ];
});
};
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index dd45f0157b0..7408029c460 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -10,9 +10,8 @@ import ./make-test.nix ({pkgs, ...}: rec {
emptyDiskImages = [ 20480 20480 ];
vlans = [ 1 ];
};
-
+
networking = {
- firewall.allowPing = true;
useDHCP = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = "192.168.1.1"; prefixLength = 24; }
@@ -54,7 +53,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
};
};
};
-
+
testScript = { ... }: ''
startAll;
@@ -83,7 +82,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
# Can't check ceph status until a mon is up
$aio->succeed("ceph -s | grep 'mon: 1 daemons'");
-
+
# Start the ceph-mgr daemon, it has no deps and hardly any setup
$aio->mustSucceed(
"ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring",
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index c341e83961a..e5097609fb2 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -12,8 +12,10 @@ with pkgs.lib;
mapAttrs (channel: chromiumPkg: makeTest rec {
name = "chromium-${channel}";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aszlig ];
+ meta = {
+ maintainers = with maintainers; [ aszlig ];
+ # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
+ inherit (chromiumPkg.meta) timeout;
};
enableOCR = true;
@@ -166,7 +168,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
die "sandbox not working properly: $clipboard"
- unless $clipboard =~ /namespace sandbox.*yes/mi
+ unless $clipboard =~ /layer 1 sandbox.*namespace/mi
&& $clipboard =~ /pid namespaces.*yes/mi
&& $clipboard =~ /network namespaces.*yes/mi
&& $clipboard =~ /seccomp.*sandbox.*yes/mi
@@ -184,7 +186,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
die "copying twice in a row does not work properly: $clipboard"
- unless $clipboard =~ /namespace sandbox.*yes/mi
+ unless $clipboard =~ /layer 1 sandbox.*namespace/mi
&& $clipboard =~ /pid namespaces.*yes/mi
&& $clipboard =~ /network namespaces.*yes/mi
&& $clipboard =~ /seccomp.*sandbox.*yes/mi
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index ab5f8e0bcf3..e03bb988254 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -13,9 +13,6 @@ let
# CJDNS output is incompatible with the XML log.
systemd.services.cjdns.serviceConfig.StandardOutput = "null";
- #networking.firewall.enable = true;
- networking.firewall.allowPing = true;
- #networking.firewall.rejectPackets = true;
};
in
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index bd8bd5dee9c..777cf9a7e7f 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -42,7 +42,6 @@ import ./make-test.nix ({ pkgs, ...} : {
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
};
};
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index 8f874b3585d..b4c48afe48b 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -43,7 +43,6 @@ import ./make-test.nix ({ pkgs, ...} : {
config =
{
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
};
};
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 4affe3d9d56..5f83a33b107 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -20,7 +20,6 @@ import ./make-test.nix ({ pkgs, ...} : {
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
system.stateVersion = "18.03";
};
};
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index 7db389a18e7..5866e51b731 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -25,7 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : {
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
};
};
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index be83f82445e..d2dda926fc0 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -28,7 +28,6 @@ import ./make-test.nix ({ pkgs, ...} : {
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
};
};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index aeb0a6e68e2..0fb3b591e9f 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -10,7 +10,6 @@ let
hostBridge = "br0";
config = {
networking.firewall.enable = false;
- networking.firewall.allowPing = true;
networking.interfaces.eth0.ipv4.addresses = [
{ address = "192.168.1.122"; prefixLength = 24; }
];
diff --git a/nixos/tests/docker-preloader.nix b/nixos/tests/docker-preloader.nix
new file mode 100644
index 00000000000..eeedec9a392
--- /dev/null
+++ b/nixos/tests/docker-preloader.nix
@@ -0,0 +1,27 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "docker-preloader";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lewo ];
+ };
+
+ nodes = {
+ docker =
+ { pkgs, ... }:
+ {
+ virtualisation.docker.enable = true;
+ virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ];
+
+ services.openssh.enable = true;
+ services.openssh.permitRootLogin = "yes";
+ services.openssh.extraConfig = "PermitEmptyPasswords yes";
+ users.extraUsers.root.password = "";
+ };
+ };
+ testScript = ''
+ startAll;
+
+ $docker->waitForUnit("sockets.target");
+ $docker->succeed("docker run nix nix-store --version");
+ $docker->succeed("docker run bash bash --version");
+ '';
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 3af2cbcd098..53675c375e3 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -1,14 +1,18 @@
# This test runs gitlab and checks if it works
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
name = "gitlab";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar offline ];
+ maintainers = [ globin ];
};
nodes = {
gitlab = { ... }: {
- virtualisation.memorySize = 768;
+ virtualisation.memorySize = 4096;
+ systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
+ systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
+ systemd.services.gitaly.serviceConfig.Restart = mkForce "no";
+ systemd.services.gitlab-sidekiq.serviceConfig.Restart = mkForce "no";
services.nginx = {
enable = true;
@@ -19,10 +23,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
- systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
services.gitlab = {
enable = true;
databasePassword = "dbPassword";
+ initialRootPassword = "notproduction";
secrets = {
secret = "secret";
otp = "otpsecret";
@@ -65,8 +69,12 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript = ''
$gitlab->start();
+ $gitlab->waitForUnit("gitaly.service");
+ $gitlab->waitForUnit("gitlab-workhorse.service");
$gitlab->waitForUnit("gitlab.service");
$gitlab->waitForUnit("gitlab-sidekiq.service");
- $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
+ $gitlab->waitForFile("/var/gitlab/state/tmp/sockets/gitlab.socket");
+ $gitlab->waitUntilSucceeds("curl -sSf http://localhost/users/sign_in");
+ $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2")
'';
})
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 2d74b59bca4..0b3da0d59c6 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -74,7 +74,6 @@ in {
print "$log\n";
# Check that no errors were logged
- # The timer can get out of sync due to Hydra's load, so this error is ignored
- $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR");
+ $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
'';
})
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 9c280fe8b5b..04b4f0f045f 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
lib.mkMerge [
{ virtualisation.vlans = [ 2 1 ];
networking.firewall.enable = withFirewall;
- networking.firewall.allowPing = true;
networking.nat.internalIPs = [ "192.168.1.0/24" ];
networking.nat.externalInterface = "eth1";
}
@@ -33,7 +32,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
{ pkgs, nodes, ... }:
lib.mkMerge [
{ virtualisation.vlans = [ 1 ];
- networking.firewall.allowPing = true;
networking.defaultGateway =
(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;
}
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 87a8c4c0e19..d1d4fd41dda 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -17,7 +17,6 @@ let
networking = {
useDHCP = false;
useNetworkd = networkd;
- firewall.allowPing = true;
firewall.checkReversePath = true;
firewall.allowedUDPPorts = [ 547 ];
interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
@@ -86,7 +85,6 @@ let
virtualisation.vlans = [ 1 2 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
defaultGateway = "192.168.1.1";
interfaces.eth1.ipv4.addresses = mkOverride 0 [
@@ -139,7 +137,6 @@ let
virtualisation.vlans = [ 1 2 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = true;
interfaces.eth1 = {
ipv4.addresses = mkOverride 0 [ ];
@@ -194,7 +191,6 @@ let
virtualisation.vlans = [ 1 2 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
interfaces.eth1 = {
ipv4.addresses = mkOverride 0 [ ];
@@ -234,7 +230,6 @@ let
virtualisation.vlans = [ 1 2 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
bonds.bond = {
interfaces = [ "eth1" "eth2" ];
@@ -271,7 +266,6 @@ let
virtualisation.vlans = [ vlan ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
interfaces.eth1.ipv4.addresses = mkOverride 0
[ { inherit address; prefixLength = 24; } ];
@@ -285,7 +279,6 @@ let
virtualisation.vlans = [ 1 2 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
bridges.bridge.interfaces = [ "eth1" "eth2" ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
@@ -329,7 +322,6 @@ let
# reverse path filtering rules for the macvlan interface seem
# to be incorrect, causing the test to fail. Disable temporarily.
firewall.checkReversePath = false;
- firewall.allowPing = true;
useDHCP = true;
macvlans.macvlan.interface = "eth1";
interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
@@ -415,7 +407,6 @@ let
#virtualisation.vlans = [ 1 ];
networking = {
useNetworkd = networkd;
- firewall.allowPing = true;
useDHCP = false;
vlans.vlan = {
id = 1;
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 4c0cbca2101..4d3479168f7 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -17,11 +17,12 @@ import ./make-test.nix {
extraServerArgs = [ "-v" ];
serverConfiguration = ''
listen on 0.0.0.0
+ action do_relay relay
# DO NOT DO THIS IN PRODUCTION!
# Setting up authentication requires a certificate which is painful in
# a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
# WELL-CONTROLLED ENVIRONMENT!
- accept from any for any relay
+ match from any for any action do_relay
'';
};
};
@@ -41,8 +42,9 @@ import ./make-test.nix {
extraServerArgs = [ "-v" ];
serverConfiguration = ''
listen on 0.0.0.0
- accept from any for local deliver to mda \
+ action dovecot_deliver mda \
"${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
+ match from any for local action dovecot_deliver
'';
};
services.dovecot2 = {
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index eb705536827..788c8719c8d 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -26,31 +26,20 @@ import ./make-test.nix ({ pkgs, ...} :
services.xserver.displayManager.sddm.theme = "breeze-ocr-theme";
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.default = "plasma5";
+ services.xserver.displayManager.sddm.autoLogin = {
+ enable = true;
+ user = "alice";
+ };
virtualisation.memorySize = 1024;
environment.systemPackages = [ sddm_theme ];
-
- # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
- nixpkgs.config.packageOverrides = superPkgs: {
- fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
- version = "0.3.3";
- sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9";
- };
- };
};
- enableOCR = true;
-
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
xdo = "${pkgs.xdotool}/bin/xdotool";
in ''
startAll;
- # Wait for display manager to start
- $machine->waitForText(qr/${user.description}/);
- $machine->screenshot("sddm");
-
- # Log in
- $machine->sendChars("${user.password}\n");
+ # wait for log in
$machine->waitForFile("/home/alice/.Xauthority");
$machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index f8b63c5b6a2..49be0672a8e 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
{ pkgs, ... }:
{
- services.postgresql = let mypg = pkgs.postgresql100; in {
+ services.postgresql = let mypg = pkgs.postgresql_11; in {
enable = true;
package = mypg;
extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 0ff14a21584..6aee7ea57f0 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -66,7 +66,6 @@ import ./make-test.nix ({ pkgs, ... }:
virtualisation.vlans = [ 3 ];
networking.defaultGateway = ifAddr nodes.router2 "eth1";
networking.firewall.allowedTCPPorts = [ 80 ];
- networking.firewall.allowPing = true;
services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.com";
};
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
index a12622b6aa0..af765f37b91 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixos/tests/rspamd.nix
@@ -27,7 +27,7 @@ let
$machine->succeed("id \"rspamd\" >/dev/null");
${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
sleep 10;
- $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
$machine->log($machine->succeed("systemctl cat rspamd.service"));
$machine->log($machine->succeed("curl http://localhost:11334/auth"));
$machine->log($machine->succeed("curl http://127.0.0.1:11334/auth"));
@@ -55,7 +55,7 @@ in
$machine->waitForFile("/run/rspamd.sock");
${checkSocket "/run/rspamd.sock" "root" "root" "600" }
${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
- $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
$machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
$machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
'';
@@ -86,9 +86,80 @@ in
$machine->waitForFile("/run/rspamd.sock");
${checkSocket "/run/rspamd.sock" "root" "root" "600" }
${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
- $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+ $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
$machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
$machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
'';
};
+ customLuaRules = makeTest {
+ name = "rspamd-custom-lua-rules";
+ machine = {
+ environment.etc."tests/no-muh.eml".text = ''
+ From: Sheep1
+ To: Sheep2
+ Subject: Evil cows
+
+ I find cows to be evil don't you?
+ '';
+ environment.etc."tests/muh.eml".text = ''
+ From: Cow
+ To: Sheep2
+ Subject: Evil cows
+
+ Cows are majestic creatures don't Muh agree?
+ '';
+ services.rspamd = {
+ enable = true;
+ locals."groups.conf".text = ''
+ group "cows" {
+ symbol {
+ NO_MUH = {
+ weight = 1.0;
+ description = "Mails should not muh";
+ }
+ }
+ }
+ '';
+ localLuaRules = pkgs.writeText "rspamd.local.lua" ''
+ local rspamd_logger = require "rspamd_logger"
+ rspamd_config.NO_MUH = {
+ callback = function (task)
+ local parts = task:get_text_parts()
+ if parts then
+ for _,part in ipairs(parts) do
+ local content = tostring(part:get_content())
+ rspamd_logger.infox(rspamd_config, 'Found content %s', content)
+ local found = string.find(content, "Muh");
+ rspamd_logger.infox(rspamd_config, 'Found muh %s', tostring(found))
+ if found then
+ return true
+ end
+ end
+ end
+ return false
+ end,
+ score = 5.0,
+ description = 'Allow no cows',
+ group = "cows",
+ }
+ rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
+ '';
+ };
+ };
+ testScript = ''
+ ${initMachine}
+ $machine->waitForOpenPort(11334);
+ $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
+ $machine->log($machine->succeed("cat /etc/rspamd/rspamd.local.lua"));
+ $machine->log($machine->succeed("cat /etc/rspamd/local.d/groups.conf"));
+ ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
+ $machine->log($machine->succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping"));
+ $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat"));
+ $machine->log($machine->succeed("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334"));
+ $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols"));
+ $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i muh >&2");
+ $machine->log($machine->fail("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
+ $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
+ '';
+ };
}
diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix
new file mode 100644
index 00000000000..969d59e0f2c
--- /dev/null
+++ b/nixos/tests/rsyslogd.nix
@@ -0,0 +1,38 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+{
+ test1 = makeTest {
+ name = "rsyslogd-test1";
+ meta.maintainers = [ maintainers.aanderse ];
+
+ machine =
+ { config, pkgs, ... }:
+ { services.rsyslogd.enable = true;
+ services.journald.forwardToSyslog = false;
+ };
+
+ # ensure rsyslogd isn't receiving messages from journald if explicitly disabled
+ testScript = ''
+ $machine->waitForUnit("default.target");
+ $machine->fail("test -f /var/log/messages");
+ '';
+ };
+
+ test2 = makeTest {
+ name = "rsyslogd-test2";
+ meta.maintainers = [ maintainers.aanderse ];
+
+ machine =
+ { config, pkgs, ... }:
+ { services.rsyslogd.enable = true;
+ };
+
+ # ensure rsyslogd is receiving messages from journald
+ testScript = ''
+ $machine->waitForUnit("default.target");
+ $machine->succeed("test -f /var/log/messages");
+ '';
+ };
+}
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 60f44c3c845..7f9c266cbff 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,22 +1,27 @@
-import ./make-test.nix ({ ... }:
-let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
+import ./make-test.nix ({ lib, ... }:
+let
+ mungekey = "mungeverryweakkeybuteasytointegratoinatest";
+
slurmconfig = {
controlMachine = "control";
- nodeName = ''
- control
- NodeName=node[1-3] CPUs=1 State=UNKNOWN
+ nodeName = [ "node[1-3] CPUs=1 State=UNKNOWN" ];
+ partitionName = [ "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP" ];
+ extraConfig = ''
+ AccountingStorageHost=dbd
+ AccountingStorageType=accounting_storage/slurmdbd
'';
- partitionName = "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP";
};
in {
name = "slurm";
+ meta.maintainers = [ lib.maintainers.markuskowa ];
+
nodes =
let
computeNode =
{ ...}:
{
- # TODO slrumd port and slurmctld port should be configurations and
+ # TODO slurmd port and slurmctld port should be configurations and
# automatically allowed by the firewall.
networking.firewall.enable = false;
services.slurm = {
@@ -43,6 +48,24 @@ in {
} // slurmconfig;
};
+ dbd =
+ { pkgs, ... } :
+ {
+ networking.firewall.enable = false;
+ services.slurm.dbdserver = {
+ enable = true;
+ };
+ services.mysql = {
+ enable = true;
+ package = pkgs.mysql;
+ ensureDatabases = [ "slurm_acct_db" ];
+ ensureUsers = [{
+ ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
+ name = "slurm";
+ }];
+ };
+ };
+
node1 = computeNode;
node2 = computeNode;
node3 = computeNode;
@@ -54,7 +77,7 @@ in {
startAll;
# Set up authentification across the cluster
- foreach my $node (($submit,$control,$node1,$node2,$node3))
+ foreach my $node (($submit,$control,$dbd,$node1,$node2,$node3))
{
$node->waitForUnit("default.target");
@@ -63,10 +86,22 @@ in {
$node->succeed("chmod 0400 /etc/munge/munge.key");
$node->succeed("chown munge:munge /etc/munge/munge.key");
$node->succeed("systemctl restart munged");
- }
+
+ $node->waitForUnit("munged");
+ };
# Restart the services since they have probably failed due to the munge init
# failure
+ subtest "can_start_slurmdbd", sub {
+ $dbd->succeed("systemctl restart slurmdbd");
+ $dbd->waitForUnit("slurmdbd.service");
+ };
+
+ # there needs to be an entry for the current
+ # cluster in the database before slurmctld is restarted
+ subtest "add_account", sub {
+ $control->succeed("sacctmgr -i add cluster default");
+ };
subtest "can_start_slurmctld", sub {
$control->succeed("systemctl restart slurmctld");
@@ -81,12 +116,17 @@ in {
}
};
- # Test that the cluster work and can distribute jobs;
+ # Test that the cluster works and can distribute jobs;
subtest "run_distributed_command", sub {
# Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
# The output must contain the 3 different names
$submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
};
+
+ subtest "check_slurm_dbd", sub {
+ # find the srun job from above in the database
+ $submit->succeed("sacct | grep hostname");
+ };
'';
})
diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix
new file mode 100644
index 00000000000..9ba3863411e
--- /dev/null
+++ b/nixos/tests/solr.nix
@@ -0,0 +1,47 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+{
+ name = "solr";
+ meta.maintainers = [ lib.maintainers.aanderse ];
+
+ machine =
+ { config, pkgs, ... }:
+ {
+ # Ensure the virtual machine has enough memory for Solr to avoid the following error:
+ #
+ # OpenJDK 64-Bit Server VM warning:
+ # INFO: os::commit_memory(0x00000000e8000000, 402653184, 0)
+ # failed; error='Cannot allocate memory' (errno=12)
+ #
+ # There is insufficient memory for the Java Runtime Environment to continue.
+ # Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory.
+ virtualisation.memorySize = 2000;
+
+ services.solr.enable = true;
+ };
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit('solr.service');
+ $machine->waitForOpenPort('8983');
+ $machine->succeed('curl --fail http://localhost:8983/solr/');
+
+ # adapted from pkgs.solr/examples/films/README.txt
+ $machine->succeed('sudo -u solr solr create -c films');
+ $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{
+ "add-field" : {
+ "name":"name",
+ "type":"text_general",
+ "multiValued":false,
+ "stored":true
+ },
+ "add-field" : {
+ "name":"initial_release_date",
+ "type":"pdate",
+ "stored":true
+ }
+ }')) =~ /"status":0/ or die;
+ $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');
+ $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;
+ '';
+})
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 87f5d0be68a..b24dbb8f90a 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -90,5 +90,5 @@ rec {
parity-beta = callPackage ./parity/beta.nix { };
parity-ui = callPackage ./parity-ui { };
- particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; };
+ particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; };
}
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index b23f3ad4243..33ac2be1832 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.16.2";
+ version = "0.16.3";
src = fetchFromGitHub {
owner = "litecoin-project";
repo = "litecoin";
rev = "v${version}";
- sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6";
+ sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index a06f373683a..d3b20ef2ea3 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -10,31 +10,40 @@
, zeromq
, zlib
, unixtools
+, python3
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "particl-core-${version}";
- version = "0.16.2.0";
+ version = "0.17.0.2";
src = fetchurl {
url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
- sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617";
+ sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [
- openssl db48 boost zlib miniupnpc libevent zeromq
- unixtools.hexdump
+ buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ];
+
+ configureFlags = [
+ "--disable-bench"
+ "--with-boost-libdir=${boost.out}/lib"
+ ] ++ optionals (!doCheck) [
+ "--enable-tests=no"
];
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+ # Always check during Hydra builds
+ doCheck = true;
+ preCheck = "patchShebangs test";
+ enableParallelBuilding = true;
meta = {
description = "Privacy-Focused Marketplace & Decentralized Application Platform";
longDescription= ''
An open source, decentralized privacy platform built for global person to person eCommerce.
+ RPC daemon and CLI client only.
'';
homepage = https://particl.io/;
maintainers = with maintainers; [ demyanrogozhin ];
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
new file mode 100644
index 00000000000..40fb0c6d9e1
--- /dev/null
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "avldrums.lv2";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "x42";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0w51gdshq2i5bix2x5l3g3gnycy84nlzf5sj0jkrw0zrnbk6ghwg";
+ fetchSubmodules = true;
+ };
+
+ installFlags = "PREFIX=$(out)";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ pango cairo libGLU lv2
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Dedicated AVLDrumkits LV2 Plugin";
+ homepage = http://x42-plugins.com/x42/x42-avldrums;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index 274233167bd..e3f1b6acf87 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
-, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }:
+, gnumake, gcc-arm-embedded, binutils-arm-embedded
+, dfu-util-axoloti, jdk, ant, libfaketime }:
stdenv.mkDerivation rec {
version = "1.0.12-2";
@@ -20,7 +21,15 @@ stdenv.mkDerivation rec {
sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
};
- buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
+ nativeBuildInputs = [
+ makeWrapper
+ unzip
+ gcc-arm-embedded
+ binutils-arm-embedded
+ dfu-util-axoloti
+ ant
+ ];
+ buildInputs = [jdk libfaketime ];
patchPhase = ''
unzip ${chibios}
@@ -31,15 +40,6 @@ stdenv.mkDerivation rec {
substituteInPlace "chibios/os/various/shell.c" \
--replace "#ifdef __DATE__" "#if 0"
- # Hardcode full path to compiler tools
- for f in "firmware/Makefile.patch" \
- "firmware/Makefile" \
- "firmware/flasher/Makefile" \
- "firmware/mounter/Makefile"; do
- substituteInPlace "$f" \
- --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-"
- done
-
# Hardcode path to "make"
for f in "firmware/compile_firmware_linux.sh" \
"firmware/compile_patch_linux.sh"; do
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 2d90599346f..1f53809e905 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,23 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "caps-${version}";
- version = "0.9.24";
+ version = "0.9.26";
src = fetchurl {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
- sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp";
+ sha256 = "1jcq9y51vdnk93q27r566y9qmddvadhr4ddnvkiypaq5rrdnqjg7";
};
- patches = [
- (fetchurl {
- url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch";
- sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway";
- })
- (fetchurl {
- url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch";
- sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9";
- })
- ];
-
configurePhase = ''
echo "PREFIX = $out" > defines.make
'';
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
new file mode 100644
index 00000000000..e528e9699a7
--- /dev/null
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ version = "2018-10-11";
+ name = "cmusfm-unstable-${version}";
+ src = fetchFromGitHub {
+ owner = "Arkq";
+ repo = "cmusfm";
+ rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873";
+ sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b";
+ };
+ # building
+ configureFlags = [ "--enable-libnotify" ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ curl libnotify gdk_pixbuf ];
+
+ meta = with stdenv.lib; {
+ description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";
+ longDescription = ''
+ Features:
+ + Listening now notification support
+ + Off-line played track cache for later submission
+ + POSIX ERE-based file name parser
+ + Desktop notification support (optionally)
+ + Customizable scrobbling service
+ + Small memory footprint
+ Configuration:
+ + run `cmusfm init` to generate configuration file under ~/.config/cmus/cmusfm.conf
+ + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm
+ '';
+ homepage = https://github.com/Arkq/cmusfm/;
+ maintainers = with stdenv.lib.maintainers; [ CharlesHD ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index b3d9fd58028..fbe987e09cb 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }:
+{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "dragonfly-reverb-${src.rev}";
- src = fetchgit {
- url = "https://github.com/michaelwillis/dragonfly-reverb";
- rev = "0.9.1";
- sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd";
+ src = fetchFromGitHub {
+ owner = "michaelwillis";
+ repo = "dragonfly-reverb";
+ rev = "0.9.4";
+ sha256 = "0lc45jybjwg4wrcz4s9lvzpvqawgj825rkqhz2xxvalfbvjazi53";
+ fetchSubmodules = true;
};
patchPhase = ''
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix
new file mode 100644
index 00000000000..e7e4744eea2
--- /dev/null
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "GxPlugins.lv2";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "brummer10";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "16r5bj7w726d9327flg530fn0bli4crkxjss7i56yhb1bsi39mbv";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ xorg.libX11 xproto cairo lv2
+ ];
+
+ installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/brummer10/GxPlugins.lv2;
+ description = "A set of extra lv2 plugins from the guitarix project";
+ maintainers = [ maintainers.magnetophon ];
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix
new file mode 100644
index 00000000000..19aac1bd1e9
--- /dev/null
+++ b/pkgs/applications/audio/hybridreverb2/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2,
+ freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon,
+ epoxy, at-spi2-core, dbus, curl, fftwFloat }:
+
+let
+ pname = "HybridReverb2";
+ version = "2.1.1";
+ owner = "jpcima";
+ DBversion = "1.0.0";
+in
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ impulseDB = fetchzip {
+ url = "https://github.com/${owner}/${pname}-impulse-response-database/archive/v${DBversion}.zip";
+ sha256 = "1hlfxbbkahm1k2sk3c3n2mjaz7k80ky3r55xil8nfbvbv0qan89z";
+ };
+
+ src = fetchFromGitHub {
+ inherit owner;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "15mba9qvlis0qrklr50wp3jdysvmk33m7pvclp0k1is9pirj97cb";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake ];
+ buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre
+ libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ];
+
+ cmakeFlags = [
+ "-DHybridReverb2_AdvancedJackStandalone=ON"
+ "-DHybridReverb2_UseLocalDatabase=ON"
+ ];
+
+ postInstall = ''
+ mkdir -p $out/share/${pname}/
+ cp -r ${impulseDB}/* $out/share/${pname}/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www2.ika.ruhr-uni-bochum.de/HybridReverb2;
+ description = "Reverb effect using hybrid impulse convolution";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index e999672f4ab..8df2be1a039 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,7 +4,7 @@
, gobjectIntrospection, wrapGAppsHook }:
python3.pkgs.buildPythonApplication rec {
- version = "0.9.605";
+ version = "0.9.610";
name = "lollypop-${version}";
format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74";
+ sha256 = "0nn4cjw0c2ysd3y2a7l08ybcd21v993wsz99f7w0881jhws3q5p4";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 546a47118a0..3649a0a6886 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.27.1";
+ version = "3.28.1";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk";
+ sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index b377db65c0c..cb267d8bbb6 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -5,6 +5,7 @@
, pkgconfig
, ffmpeg_4
, patchelf
+, fdk_aac
, libtool
, cmake
, bluez
@@ -22,13 +23,13 @@ let
in stdenv.mkDerivation rec {
name = "pulseaudio-modules-bt-${version}";
- version = "unstable-2018-10-16";
+ version = "unstable-2018-11-01";
src = fetchFromGitHub {
owner = "EHfive";
repo = "pulseaudio-modules-bt";
- rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30";
- sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy";
+ rev = "a2f62fcaa702bb883c07d074ebca8d7135520ab8";
+ sha256 = "1fhg7q9064zikhy0xxldn4fvh49pc47mgikcbd9yhsk66gcn6zj3";
fetchSubmodules = true;
};
@@ -45,6 +46,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
pulseaudio
ffmpeg_4
+ fdk_aac
libtool
bluez
dbus
@@ -72,7 +74,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/EHfive/pulseaudio-modules-bt;
- description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio";
+ description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ adisbladis ];
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
index 2b4ff86ab71..e500d1fb133 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -1,11 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f5baa0..1f35cce 100644
+index d869979..185144d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -122,5 +121,4 @@ INSTALL(TARGETS
+@@ -143,13 +143,13 @@ INSTALL(TARGETS
module-bluez5-device
module-bluetooth-discover
module-bluetooth-policy
- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
--
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
+
+ if(NOT ${HAVE_SYSTEM_LDAC})
+
+ INSTALL(TARGETS
+ ldacBT_enc
+ ldacBT_abr
+- LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
+
+ endif()
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index f7463207045..a5dae1d0560 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
- version = "4.3.7";
+ version = "4.3.9";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk";
+ sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 3afd73493b0..5730dec6b99 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,49 +1,61 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, asio, alsaLib, avahi, libogg, libvorbis, flac }:
+, alsaLib, asio, avahi, flac, libogg, libvorbis }:
let
- popl = stdenv.mkDerivation rec {
- name = "popl-${version}";
- version = "1.1.0";
+ dependency = { name, version, sha256 }:
+ stdenv.mkDerivation {
+ name = "${name}-${version}";
src = fetchFromGitHub {
owner = "badaix";
- repo = "popl";
- rev = "v${version}";
- sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i";
+ repo = name;
+ rev = "v${version}";
+ inherit sha256;
};
+
nativeBuildInputs = [ cmake ];
};
- aixlog = stdenv.mkDerivation rec {
- name = "aixlog-${version}";
+ aixlog = dependency {
+ name = "aixlog";
version = "1.2.1";
+ sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
+ };
- src = fetchFromGitHub {
- owner = "badaix";
- repo = "aixlog";
- rev = "v${version}";
- sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
- };
- nativeBuildInputs = [ cmake ];
+ popl = dependency {
+ name = "popl";
+ version = "1.2.0";
+ sha256 = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai";
};
in
stdenv.mkDerivation rec {
name = "snapcast-${version}";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
- owner = "badaix";
- repo = "snapcast";
- rev = "v${version}";
- sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6";
+ owner = "badaix";
+ repo = "snapcast";
+ rev = "v${version}";
+ sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ];
+ # snapcast also supports building against tremor but as we have libogg, that's
+ # not needed
+ buildInputs = [
+ alsaLib asio avahi flac libogg libvorbis
+ aixlog popl
+ ];
+
+ # Upstream systemd unit files are pretty awful, so we provide our own in a
+ # NixOS module. It might make sense to get that upstreamed...
+ postInstall = ''
+ install -d $out/share/doc/snapcast
+ cp -r ../doc/* ../*.md $out/share/doc/snapcast
+ '';
meta = with lib; {
description = "Synchronous multi-room audio player";
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 0709917a044..8534d871c66 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-18.7";
+ name = "snd-18.8";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl";
+ sha256 = "16p6cmxl8y58wa19k1z6i66qsqaz7rld4850b0sprbxjjb6cqhf7";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index cbcf5220564..15aaab40a67 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,14 +5,14 @@
let
# TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
# "rev" decides what is actually being downloaded
- version = "1.0.83.316.ge96b6e67-5";
+ version = "1.0.93.242.gc2341a27-15";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "17";
+ rev = "24";
deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
+ sha512 = "920d55b3dcad4ac6acd9bc73c8ad8eb1668327a175da465ce3d8bba2430da47aaefa5218659315fab43b5182611eb03047d4e2679c1345c57380b7def7a1212d";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix
new file mode 100644
index 00000000000..562fdc1be8b
--- /dev/null
+++ b/pkgs/applications/audio/wolf-shaper/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "wolf-shaper-${version}";
+ version = "0.1.6";
+
+ src = fetchFromGitHub {
+ owner = "pdesaulniers";
+ repo = "wolf-shaper";
+ rev = "v${version}";
+ sha256 = "01h5dm1nrr0i54ancwznr7wn4vpw08dw0b69v3axy32r5j7plw6s";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ];
+
+ makeFlags = [
+ "BUILD_LV2=true"
+ "BUILD_DSSI=true"
+ "BUILD_VST2=true"
+ "BUILD_JACK=true"
+ ];
+
+ patchPhase = ''
+ patchShebangs ./dpf/utils/generate-ttl.sh
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2
+ mkdir -p $out/lib/dssi
+ mkdir -p $out/lib/vst
+ mkdir -p $out/bin/
+ cp -r bin/wolf-shaper.lv2 $out/lib/lv2/
+ cp -r bin/wolf-shaper-dssi* $out/lib/dssi/
+ cp -r bin/wolf-shaper-vst.so $out/lib/vst/
+ cp -r bin/wolf-shaper $out/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://pdesaulniers.github.io/wolf-shaper/;
+ description = "Waveshaper plugin with spline-based graph editor";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index ef80aa00563..91446f73507 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lightdm-mini-greeter-${version}";
- version = "0.3.2";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "prikhi";
repo = "lightdm-mini-greeter";
rev = version;
- sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy";
+ sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "A minimal, configurable, single-user GTK3 LightDM greeter";
homepage = https://github.com/prikhi/lightdm-mini-greeter;
license = licenses.gpl3;
- maintainers = with maintainers; [ mnacamura ];
+ maintainers = with maintainers; [ mnacamura prikhi ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index c9fd4f9c4ab..3de4067f55d 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "0.17.0";
+ version = "0.18.0";
in mkDerivation rec {
name = "sddm-${version}";
@@ -13,12 +13,11 @@ in mkDerivation rec {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
+ sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq";
};
patches = [
./sddm-ignore-config-mtime.patch
- ./qt511.patch
];
postPatch =
diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch
deleted file mode 100644
index 6430e60ed41..00000000000
--- a/pkgs/applications/display-managers/sddm/qt511.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 005c9ad..71b46d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
- find_package(XKB REQUIRED)
-
- # Qt 5
--find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
-+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
-
- # find qt5 imports dir
- get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index c9d935a..bb85ddd 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
-
- include_directories(../src/common)
-
--
- set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
- add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
- add_test(NAME Configuration COMMAND ConfigurationTest)
-
--qt5_use_modules(ConfigurationTest Test)
-+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b6a6acf8ab7..e97e22e4a9e 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,14 +13,14 @@ let
sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
};
betaVersion = {
- version = "3.3.0.13"; # "Android Studio 3.3 Beta 1"
- build = "182.5073496";
- sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px";
+ version = "3.3.0.14"; # "Android Studio 3.3 Beta 2"
+ build = "182.5078385";
+ sha256Hash = "10jw508fzxbknfl1l058ksnnli2nav91wmh2x2p0mz96lkf5bvhn";
};
latestVersion = { # canary & dev
- version = "3.4.0.0"; # "Android Studio 3.4 Canary 1"
- build = "182.5070326";
- sha256Hash = "03h2yns8s9dqbbc9agxhidpmziy9g3z89nm3byydw43hdz54hxab";
+ version = "3.4.0.1"; # "Android Studio 3.4 Canary 2"
+ build = "183.5081642";
+ sha256Hash = "0ck6habkgnwbr10pr3bfy8ywm3dsm21k9jdj7g685v22sw0zy3yk";
};
in rec {
# Old alias
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 6cfba39ed4b..834c6bedf3c 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,6 +1,19 @@
{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }:
let
+ versions = {
+ atom = {
+ version = "1.32.1";
+ sha256 = "1x22jbhvagqw9mvq0v7z4z09qp727vl0rkyvaxn98xnj9gvcfkq9";
+ };
+
+ atom-beta = {
+ version = "1.33.0";
+ beta = 1;
+ sha256 = "0sf98apmb57msgr5p1xly0mffzn2s808nsfsmbisk4qqmm9fv2m3";
+ };
+ };
+
common = pname: {version, sha256, beta ? null}:
let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}";
name = "${pname}-${fullVersion}";
@@ -71,15 +84,4 @@ let
platforms = platforms.x86_64;
};
};
-in stdenv.lib.mapAttrs common {
- atom = {
- version = "1.31.2";
- sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
- };
-
- atom-beta = {
- version = "1.32.0";
- beta = 0;
- sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
- };
-}
+in stdenv.lib.mapAttrs common versions
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
new file mode 100644
index 00000000000..dbdc13ece2a
--- /dev/null
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }:
+
+with qt5;
+
+stdenv.mkDerivation rec {
+ version = "0.9.1";
+ name = "featherpad-${version}";
+ src = fetchFromGitHub {
+ owner = "tsujan";
+ repo = "FeatherPad";
+ rev = "V${version}";
+ sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla";
+ };
+ nativeBuildInputs = [ qmake pkgconfig qttools ];
+ buildInputs = [ qtbase qtsvg qtx11extras ];
+ meta = with stdenv.lib; {
+ description = "Lightweight Qt5 Plain-Text Editor for Linux";
+ homepage = https://github.com/tsujan/FeatherPad;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.flosse ];
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 23ecfb0c19d..f5fbf1b5f03 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2018.2.4"; /* updated by script */
+ version = "2018.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */
+ sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA Release";
@@ -302,12 +302,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2018.2.4"; /* updated by script */
+ version = "2018.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */
+ sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA Release";
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 259c319c70f..494ad686ee3 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation
, lib
-, fetchgit
+, fetchurl
, extra-cmake-modules
, kdoctools
, wrapGAppsHook
@@ -22,13 +22,11 @@
}:
mkDerivation rec {
- name = "kile-${version}";
- version = "2017-02-09";
+ name = "kile-2.9.92";
- src = fetchgit {
- url = git://anongit.kde.org/kile.git;
- rev = "f77f6e627487c152f111e307ad6dc71699ade746";
- sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
+ src = fetchurl {
+ url = "mirror://sourceforge/kile/${name}.tar.bz2";
+ sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2";
};
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index b0c834934f9..8e99005bbf6 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,14 +4,14 @@ with stdenv.lib;
pythonPackages.buildPythonPackage rec {
pname = "neovim-remote";
- version = "2.0.5";
+ version = "2.1.0";
disabled = !pythonPackages.isPy3k;
src = fetchFromGitHub {
owner = "mhinz";
repo = "neovim-remote";
rev = "v${version}";
- sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw";
+ sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc";
};
propagatedBuildInputs = with pythonPackages; [ neovim psutil ];
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 4d4cb0239bf..87ffd3256a8 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3
+{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3
, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
, discount, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "quilter";
- version = "1.6.3";
+ version = "1.6.8";
name = "${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q";
+ sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5";
};
nativeBuildInputs = [
@@ -22,40 +22,19 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
- vala
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = [
discount
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+ gnome3.libgee
granite
gtk3
gtksourceview
gtkspell3
webkitgtk
- gnome3.libgee
- ];
-
- patches = [
- # Fix build with vala 0.42 - Drop these in next release
- (fetchpatch {
- url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch";
- sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n";
- })
- (fetchpatch {
- url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch";
- sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz";
- })
- # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170
- (fetchpatch {
- url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch";
- sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n";
- })
- # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171
- (fetchpatch {
- url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch";
- sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r";
- })
];
postPatch = ''
@@ -65,9 +44,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Focus on your writing - designed for elementary OS";
- homepage = https://github.com/lainsce/quilter;
- license = licenses.gpl2Plus;
+ homepage = https://github.com/lainsce/quilter;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/applications/editors/rstudio/clang-location.patch
new file mode 100644
index 00000000000..402abdd8563
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/clang-location.patch
@@ -0,0 +1,25 @@
+diff --git i/src/cpp/core/libclang/LibClang.cpp w/src/cpp/core/libclang/LibClang.cpp
+index ec12a3a1ff..8c81b633ae 100644
+--- i/src/cpp/core/libclang/LibClang.cpp
++++ w/src/cpp/core/libclang/LibClang.cpp
+@@ -54,7 +54,7 @@ std::vector defaultCompileArgs(LibraryVersion version)
+
+ // we need to add in the associated libclang headers as
+ // they are not discovered / used by default during compilation
+- FilePath llvmPath = s_libraryPath.parent().parent();
++ FilePath llvmPath("@clang@");
+ boost::format fmt("%1%/lib/clang/%2%/include");
+ fmt % llvmPath.absolutePath() % version.asString();
+ std::string includePath = fmt.str();
+@@ -77,10 +77,7 @@ std::vector systemClangVersions()
+ #elif defined(__unix__)
+ // default set of versions
+ clangVersions = {
+- "/usr/lib/libclang.so",
+- "/usr/lib/llvm/libclang.so",
+- "/usr/lib64/libclang.so",
+- "/usr/lib64/llvm/libclang.so",
++ "@libclang.so@"
+ };
+
+ // iterate through the set of available 'llvm' directories
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 1a5c9d65583..9d8c430630e 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -6,7 +6,7 @@
let
verMajor = "1";
verMinor = "1";
- verPatch = "456";
+ verPatch = "463";
version = "${verMajor}.${verMinor}.${verPatch}";
ginVer = "1.5";
gwtVer = "2.7.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "rstudio";
repo = "rstudio";
rev = "v${version}";
- sha256 = "0hv07qrbjwapbjrkddasglsgk0x5j7qal468i5rv77krsp09s4fz";
+ sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6";
};
# Hack RStudio to only use the input R.
diff --git a/pkgs/applications/editors/rstudio/fix-cmake.patch b/pkgs/applications/editors/rstudio/fix-cmake.patch
new file mode 100644
index 00000000000..3effc0eaa32
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/fix-cmake.patch
@@ -0,0 +1,15 @@
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index f5701bf735..27af4148ff 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -112,6 +112,7 @@ find_package(Qt5WebEngine REQUIRED)
+ find_package(Qt5WebEngineWidgets REQUIRED)
+ find_package(Qt5PrintSupport REQUIRED)
+ find_package(Qt5Quick REQUIRED)
++find_package(Qt5QuickWidgets REQUIRED)
+ find_package(Qt5Positioning REQUIRED)
+ find_package(Qt5Sensors REQUIRED)
+ find_package(Qt5Svg REQUIRED)
+--
+2.17.1
+
diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix
new file mode 100644
index 00000000000..340aeec15e0
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/preview.nix
@@ -0,0 +1,119 @@
+{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
+, openssl, R, qtbase, qtdeclarative, qtsensors, qtwebengine, qtwebchannel
+, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
+, llvmPackages
+}:
+
+let
+ rev = "f33fb2b2f1";
+ ginVer = "2.1.2";
+ gwtVer = "2.8.1";
+in
+stdenv.mkDerivation rec {
+ name = "RStudio-preview-${rev}";
+
+ nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
+
+ buildInputs = [ boost zlib openssl R qtbase qtdeclarative qtsensors
+ qtwebengine qtwebchannel libuuid ];
+
+ src = fetchFromGitHub {
+ owner = "rstudio";
+ repo = "rstudio";
+ inherit rev;
+ sha256 = "0v3vzqjp74c3m4h9l6w2lrdnjqaimdjzbf7vhnlxj2qa0lwsnykb";
+ };
+
+ # Hack RStudio to only use the input R and provided libclang.
+ patches = [ ./r-location.patch ./clang-location.patch ];
+ postPatch = ''
+ substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}
+ substituteInPlace src/cpp/core/libclang/LibClang.cpp \
+ --replace '@clang@' ${llvmPackages.clang.cc} \
+ --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so
+ '';
+
+ ginSrc = fetchurl {
+ url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip";
+ sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr";
+ };
+
+ gwtSrc = fetchurl {
+ url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
+ sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
+ };
+
+ hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts);
+
+ mathJaxSrc = fetchurl {
+ url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
+ sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
+ };
+
+ rsconnectSrc = fetchFromGitHub {
+ owner = "rstudio";
+ repo = "rsconnect";
+ rev = "984745d8";
+ sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9";
+ };
+
+ preConfigure =
+ ''
+ GWT_LIB_DIR=src/gwt/lib
+
+ mkdir -p $GWT_LIB_DIR/gin/${ginVer}
+ unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer}
+
+ unzip ${gwtSrc}
+ mkdir -p $GWT_LIB_DIR/gwt
+ mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
+
+ mkdir dependencies/common/dictionaries
+ for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
+ for i in "$dict/share/hunspell/"*; do
+ ln -sv $i dependencies/common/dictionaries/
+ done
+ done
+
+ unzip ${mathJaxSrc} -d dependencies/common/mathjax-26
+
+ mkdir -p dependencies/common/pandoc
+ cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
+
+ cp -r ${rsconnectSrc} dependencies/common/rsconnect
+ pushd dependencies/common
+ ${R}/bin/R CMD build -d --no-build-vignettes rsconnect
+ popd
+ '';
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
+
+ desktopItem = makeDesktopItem {
+ name = name;
+ exec = "rstudio %F";
+ icon = "rstudio";
+ desktopName = "RStudio Preview";
+ genericName = "IDE";
+ comment = meta.description;
+ categories = "Development;";
+ mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
+ };
+
+ postInstall = ''
+ wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
+ mkdir $out/share
+ cp -r ${desktopItem}/share/applications $out/share
+ mkdir $out/share/icons
+ ln $out/rstudio.png $out/share/icons
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Set of integrated tools for the R language";
+ homepage = https://www.rstudio.com/;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ averelld ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index cccf59f3e7b..ba68a5420a8 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
- version = "3.0.1";
+ version = "3.0.5";
src = fetchFromBitbucket {
owner = "plas";
repo = pname;
- rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0";
- sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7";
+ rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03";
+ sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index dcec9fdfef9..6d92c047157 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.1.0450";
+ version = "8.1.0490";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2";
+ sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 6ed6326f16e..3517351090d 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "OpenOrienteering-Mapper-${version}";
- version = "0.8.2";
+ version = "0.8.3";
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
qtsensors clipper zlib proj doxygen cups];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "OpenOrienteering";
repo = "mapper";
rev = "v${version}";
- sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59";
+ sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
};
cmakeFlags =
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e164a789459..8fb21e65c95 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.8-12";
- sha256 = "0rq7qhbfsxvclazi1l6kqi4wqsph7hmzcjbh2pmf0276mrkgm7cd";
+ version = "7.0.8-14";
+ sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 53264580380..52df41c683c 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -8,13 +8,13 @@ assert useUnrar -> unrar != null;
stdenv.mkDerivation rec {
name = "ahoviewer-${version}";
- version = "1.5.0";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "ahodesuka";
repo = "ahoviewer";
rev = version;
- sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
+ sha256 = "144jmk8w7dnmqy4w81b3kzama7i97chx16pgax2facn72a92921q";
};
enableParallelBuilding = true;
@@ -29,11 +29,6 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base
] ++ stdenv.lib.optional useUnrar unrar;
- # https://github.com/ahodesuka/ahoviewer/issues/60
- # Already fixed in the master branch
- # TODO: remove this next release
- makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
-
postPatch = ''patchShebangs version.sh'';
postInstall = ''
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index e0aea87c90c..7777be91897 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,23 +1,24 @@
{ stdenv, makeDesktopItem, fetchurl, unzip
-, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
-, xorg, mozjpeg
+, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
+, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
name = "avocode-${version}";
- version = "3.4.0";
+ version = "3.6.2";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
+ sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
};
- libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
+ libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
stdenv.cc.cc.lib
gdk_pixbuf
glib
- gtk2
+ gtk3
atk
+ at-spi2-atk
pango
cairo
freetype
@@ -29,7 +30,6 @@ stdenv.mkDerivation rec {
cups
expat
udev
- GConf
libX11
libxcb
libXi
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [makeWrapper];
+ buildInputs = [ unzip gtk3 gsettings-desktop-schemas];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
@@ -85,6 +86,10 @@ stdenv.mkDerivation rec {
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-rpath ${libPath}:$out/ $file
done
+ for file in $out/bin/*; do
+ wrapProgram $file \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+ done
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 4032e2e3fee..51156dea4a1 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -15,5 +15,11 @@ stdenv.mkDerivation {
homepage = https://xmlgraphics.apache.org/batik;
license = licenses.asl20;
platforms = platforms.unix;
+ knownVulnerabilities = [
+ # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html:
+ "CVE-2018-8013"
+ "CVE-2017-5662"
+ "CVE-2015-0250"
+ ];
};
}
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 9aa80fc789c..ce2bdcbd298 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
mkDerivation rec {
name = "krita-${version}";
- version = "4.1.3";
+ version = "4.1.5";
src = fetchurl {
url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
- sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx";
+ sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index ce300eaf9f6..7da1d4b612f 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -2,15 +2,13 @@
stdenv.mkDerivation rec {
name = "phototonic-${version}";
- version = "1.7.1";
+ version = "2.1";
src = fetchFromGitHub {
repo = "phototonic";
owner = "oferkv";
- # There is currently no tag for 1.7.1 see
- # https://github.com/oferkv/phototonic/issues/214
- rev = "c37070e4a068570d34ece8de1e48aa0882c80c5b";
- sha256 = "1agd3bsrpljd019qrjvlbim5l0bhpx53dhpc0gvyn0wmcdzn92gj";
+ rev = "v${version}";
+ sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7";
};
buildInputs = [ qtbase exiv2 ];
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index a409060afdc..7e7bf644ce7 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,27 +1,28 @@
{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
-, hicolor-icon-theme
+, hicolor-icon-theme, procps
}:
let
perlModules = with perlPackages;
[ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
- Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
+ Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
- PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
+ PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];
in
stdenv.mkDerivation rec {
- name = "shutter-0.94";
+ name = "shutter-0.94.2";
src = fetchurl {
- url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz";
- sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d";
+ url = "https://launchpad.net/shutter/0.9x/0.94.2/+download/shutter-0.94.2.tar.gz";
+ sha256 = "0mas7npm935j4rhqqjn226822s9sa4bsxrkp0b5fjj3z096k6vw0";
};
- buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl procps gdk_pixbuf librsvg ] ++ perlModules;
installPhase = ''
mkdir -p "$out"
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 072b66e5563..16c3a47431c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -129,6 +129,7 @@ let
kontact = callPackage ./kontact.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
konquest = callPackage ./konquest.nix {};
+ konqueror = callPackage ./konqueror.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix
new file mode 100644
index 00000000000..e6442fea2f9
--- /dev/null
+++ b/pkgs/applications/kde/konqueror.nix
@@ -0,0 +1,20 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules, kdoctools
+, kdelibs4support, kcmutils, khtml, kdesu
+, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
+}:
+
+mkDerivation {
+ name = "konqueror";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kdelibs4support kcmutils khtml kdesu
+ qtwebkit qtwebengine qtx11extras qtscript qtwayland
+ ];
+ meta = {
+ license = with lib.licenses; [ gpl2 ];
+ maintainers = with lib.maintainers; [ ];
+ };
+}
+
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index ea140cad5ee..b02e29e3351 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -14,4 +14,7 @@ mkDerivation {
qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts
knewstuff gpsd
];
+ preConfigure = ''
+ cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
+ '';
}
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 331f516c88c..a25d40e29bd 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
name = "1password-${version}";
- version = "0.5.3";
+ version = "0.5.4";
src =
if stdenv.hostPlatform.system == "i686-linux" then
fetchzip {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
- sha256 = "05s223h1yps4k9kmignl0r5sbh6w7m1hnlmafnf1kiwv7gacvxjc";
+ sha256 = "0wni2hk5b1qfr24vi24jiprpi08k3qgaw9lqp61k41a1sjp3izv0";
stripRoot = false;
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchzip {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
- sha256 = "0p9x1fx0309v8dxxaf88m8x8q15zzqywfmjn6v5wb9v3scp9396v";
+ sha256 = "169d5fl3cfw3xrlpm9nlmwbnp0xgh0la9qybzf8ragp0020nlyih";
stripRoot = false;
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchzip {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
- sha256 = "1z2xp9bn93gr4ha6zx65va1fb58a2xlnnmpv583y96gq3vbnqdcj";
+ sha256 = "1scikv7v33kzg9rqsrz97yklxaskvif84br13zg8annm43k5vlma";
stripRoot = false;
}
else throw "Architecture not supported";
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 18f47b7652f..3e5bf8df4a7 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -6,51 +6,20 @@
}:
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
+ 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.1.1";
+ version = "3.3.0";
name = "${pname}-${version}";
longName = "${pname}-application";
src = fetchurl {
url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz";
- sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr";
+ sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76";
};
nativeBuildInputs = [ makeWrapper ];
@@ -77,15 +46,26 @@ in stdenv.mkDerivation rec {
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*
+ vendorlib="\
+ $opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\
+ $opt/resources/app.asar.unpacked/encryption/out/lib:\
+ $opt/resources/deps/airtame-core/lib:\
+ $opt/resources/deps/airtame-encryption/lib"
+
+ echo $vendorlib
+
+ rpath="${libPath}:$opt:$vendorlib"
+
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.
+ interp="$(< $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter "$interp" $opt/${longName}
- wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals"
+
+ wrapProgram $opt/${longName} \
+ --prefix LD_LIBRARY_PATH=$rpath \
+ --add-flags "--disable-gpu --enable-transparent-visuals"
'';
dontPatchELF = true;
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e4dffa98f39..594173f11c6 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -73,7 +73,10 @@ in buildRustPackage rec {
buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin darwinFrameworks;
- outputs = [ "out" "terminfo" ];
+ outputs = [ "out" "terminfo" ];
+
+ # https://github.com/NixOS/nixpkgs/issues/49693
+ doCheck = !stdenv.isDarwin;
postPatch = ''
substituteInPlace copypasta/src/x11.rs \
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index f16144f3bef..d1a62dad6c9 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -3,7 +3,7 @@
let
pname = "albert";
- version = "0.14.21";
+ version = "0.14.22";
in
mkDerivation rec {
name = "${pname}-${version}";
@@ -12,7 +12,7 @@ mkDerivation rec {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
- sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w";
+ sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg";
fetchSubmodules = true;
};
@@ -48,7 +48,7 @@ mkDerivation rec {
homepage = https://albertlauncher.github.io/;
description = "Desktop agnostic launcher";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ ericsagnes ];
+ maintainers = with maintainers; [ ericsagnes synthetica ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index c803eb37ad6..1144d515284 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
stdenv.mkDerivation rec {
name = "avrdudess-2.2.20140102";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
- export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH"
+ export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 0689843af61..f085e4bd7dd 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
+{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
stdenv.mkDerivation rec {
name = "bb-${version}";
@@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
buildInputs = [
aalib ncurses libmikmod
xorg.libXau xorg.libXdmcp xorg.libX11
- ];
+ ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio;
- meta = with stdenv.lib; {
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ sed -i -e '/^#include $/d' *.c
+ '';
+
+ meta = with lib; {
homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo";
license = licenses.gpl2;
maintainers = [ maintainers.rnhmjoj ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
new file mode 100644
index 00000000000..9edf5e4f88c
--- /dev/null
+++ b/pkgs/applications/misc/dmrconfig/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub
+, libusb1, systemd }:
+
+stdenv.mkDerivation rec {
+ name = "dmrconfig-${version}";
+ version = "2018-10-29";
+
+ src = fetchFromGitHub {
+ owner = "sergev";
+ repo = "dmrconfig";
+ rev = "4924d00283c3c81a4b8251669e42aecd96b6145a";
+ sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn";
+ };
+
+ buildInputs = [
+ libusb1 systemd
+ ];
+
+ preConfigure = ''
+ substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
+ '';
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Configuration utility for DMR radios";
+ longDescription = ''
+ DMRconfig is a utility for programming digital radios via USB programming cable.
+ '';
+ homepage = https://github.com/sergev/dmrconfig;
+ license = licenses.asl20;
+ maintainers = [ maintainers.etu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 537627a10d2..843257a74e5 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1";
+ sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
new file mode 100644
index 00000000000..16693cfbf09
--- /dev/null
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid
+, sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract
+, enchant, intltool, poppler, json-glib
+, ninja
+, python3
+
+# Gtk deps
+# upstream gImagereader supports Qt too
+, gtk3, gobjectIntrospection, wrapGAppsHook
+, gnome3, gtkspell3, gtkspellmm, cairomm
+}:
+
+let
+ variant = "gtk";
+ pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
+in
+stdenv.mkDerivation rec {
+ name = "gImageReader-${version}";
+ version = "3.2.99";
+
+ src = fetchFromGitHub {
+ owner= "manisandro";
+ repo = "gImageReader";
+ rev = "v${version}";
+ sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc";
+ };
+
+ nativeBuildInputs = [
+ cmake ninja
+ intltool
+ pkgconfig
+ pythonEnv
+
+ # Gtk specific
+ wrapGAppsHook
+ gobjectIntrospection
+ ];
+
+ buildInputs = [
+ enchant
+ libxmlxx3
+ libzip
+ libuuid
+ sane-backends
+ podofo
+ libjpeg
+ djvulibre
+ tesseract
+ poppler
+
+ # Gtk specific
+ gnome3.gtkmm
+ gtkspell3
+ gtkspellmm
+ gnome3.gtksourceview
+ gnome3.gtksourceviewmm
+ cairomm
+ json-glib
+ ];
+
+ # interface type can be where is either gtk, qt5, qt4
+ cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ];
+
+ meta = with stdenv.lib; {
+ description = "A simple Gtk/Qt front-end to tesseract-ocr";
+ homepage = https://github.com/manisandro/gImageReader;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [teto];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index c353a779b64..22badfc8cdd 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.47.1";
+ version = "0.50";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,16 +10,9 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj";
+ sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff";
- sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll";
- })
- ];
-
goDeps = ./deps.nix;
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 47487029ea0..d5c24d69048 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,488 +1,721 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
+
{
goPackagePath = "github.com/BurntSushi/locker";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/locker";
- rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a";
+ rev = "a6e239ea1c69";
sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg";
};
}
+
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
- rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ rev = "a368813c5e64";
+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
+
{
goPackagePath = "github.com/PuerkitoBio/purell";
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/purell";
- rev = "975f53781597ed779763b7b65566e74c4004d8de";
- sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l";
+ rev = "v1.1.0";
+ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
};
}
+
{
goPackagePath = "github.com/PuerkitoBio/urlesc";
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/urlesc";
- rev = "de5bf2ad457846296e2031421a34e2568e304e35";
+ rev = "de5bf2ad4578";
sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
};
}
+
+ {
+ goPackagePath = "github.com/alecthomas/assert";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/assert";
+ rev = "405dbfeb8e38";
+ sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
+ };
+ }
+
{
goPackagePath = "github.com/alecthomas/chroma";
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
- rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261";
+ rev = "v0.5.0";
sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f";
};
}
+
+ {
+ goPackagePath = "github.com/alecthomas/colour";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/colour";
+ rev = "60882d9e2721";
+ sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/alecthomas/repr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/repr";
+ rev = "117648cd9897";
+ sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+ };
+ }
+
{
goPackagePath = "github.com/bep/debounce";
fetch = {
type = "git";
url = "https://github.com/bep/debounce";
- rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac";
+ rev = "v1.1.0";
sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
};
}
+
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
type = "git";
url = "https://github.com/bep/gitmap";
- rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960";
+ rev = "v1.0.0";
sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6";
};
}
+
{
goPackagePath = "github.com/bep/go-tocss";
fetch = {
type = "git";
url = "https://github.com/bep/go-tocss";
- rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c";
+ rev = "v0.5.0";
sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q";
};
}
+
{
goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
- rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f";
+ rev = "v1.1.0";
sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
};
}
+
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
- rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5";
- sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9";
+ rev = "v1.0.8";
+ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
};
}
+
{
goPackagePath = "github.com/danwakefield/fnmatch";
fetch = {
type = "git";
url = "https://github.com/danwakefield/fnmatch";
- rev = "cbb64ac3d964b81592e64f957ad53df015803288";
+ rev = "cbb64ac3d964";
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
};
}
+
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
- rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac";
+ rev = "v1.5.0";
sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r";
};
}
+
{
goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
- rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1";
- sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
+ rev = "v1.1.6";
+ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
};
}
+
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
- rev = "cdade1c073850f4ffc70a829e31235ea6892853b";
+ rev = "cdade1c07385";
sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
+
+ {
+ goPackagePath = "github.com/fortytw2/leaktest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fortytw2/leaktest";
+ rev = "v1.2.0";
+ sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra";
+ };
+ }
+
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ rev = "v1.4.7";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
- {
- goPackagePath = "github.com/gobuffalo/envy";
- fetch = {
- type = "git";
- url = "https://github.com/gobuffalo/envy";
- rev = "3c96536452167a705ca5a70b831d3810e1e10452";
- sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs";
- };
- }
+
{
goPackagePath = "github.com/gobwas/glob";
fetch = {
type = "git";
url = "https://github.com/gobwas/glob";
- rev = "f756513aec94125582ee6c0dc94179251ef87370";
- sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4";
+ rev = "v0.2.3";
+ sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
};
}
+
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "3ff3320c2a1756a3691521efc290b4701575147c";
- sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2";
+ rev = "v1.4.0";
+ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
};
}
+
{
goPackagePath = "github.com/hashicorp/go-immutable-radix";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-immutable-radix";
- rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf";
- sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv";
+ rev = "v1.0.0";
+ sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
};
}
+
+ {
+ goPackagePath = "github.com/hashicorp/go-uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-uuid";
+ rev = "v1.0.0";
+ sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy";
+ };
+ }
+
{
goPackagePath = "github.com/hashicorp/golang-lru";
fetch = {
type = "git";
url = "https://github.com/hashicorp/golang-lru";
- rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
- sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
+ rev = "v0.5.0";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
};
}
+
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
- sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+ rev = "v1.0.0";
+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
};
}
+
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "v1.0.0";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+
{
goPackagePath = "github.com/jdkato/prose";
fetch = {
type = "git";
url = "https://github.com/jdkato/prose";
- rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa";
- sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn";
+ rev = "v1.1.0";
+ sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy";
};
}
+
{
- goPackagePath = "github.com/joho/godotenv";
+ goPackagePath = "github.com/kr/pretty";
fetch = {
type = "git";
- url = "https://github.com/joho/godotenv";
- rev = "1709ab122c988931ad53508747b3c061400c2984";
- sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
};
}
+
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+
{
goPackagePath = "github.com/kyokomi/emoji";
fetch = {
type = "git";
url = "https://github.com/kyokomi/emoji";
- rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734";
+ rev = "v1.5.1";
sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
};
}
+
+ {
+ goPackagePath = "github.com/magefile/mage";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magefile/mage";
+ rev = "v1.4.0";
+ sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka";
+ };
+ }
+
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
+ rev = "v1.8.0";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
+
{
goPackagePath = "github.com/markbates/inflect";
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
- rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae";
- sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d";
+ rev = "a12c3aec81a6";
+ sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
};
}
+
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.4";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
- rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+ rev = "v0.0.3";
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
+
{
goPackagePath = "github.com/miekg/mmark";
fetch = {
type = "git";
url = "https://github.com/miekg/mmark";
- rev = "057eb9e3ae87944c038036d046101dec0c56e21f";
- sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
+ rev = "v1.3.6";
+ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
};
}
+
{
goPackagePath = "github.com/mitchellh/hashstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/hashstructure";
- rev = "2bca23e0e452137f789efbc8610126fd8b94f73b";
- sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1";
+ rev = "v1.0.0";
+ sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i";
};
}
+
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
- sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+ rev = "v1.0.0";
+ sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
};
}
+
{
goPackagePath = "github.com/muesli/smartcrop";
fetch = {
type = "git";
url = "https://github.com/muesli/smartcrop";
- rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464";
+ rev = "f6ebaa786a12";
sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
};
}
+
+ {
+ goPackagePath = "github.com/nfnt/resize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nfnt/resize";
+ rev = "83c6a9932646";
+ sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+ };
+ }
+
{
goPackagePath = "github.com/nicksnyder/go-i18n";
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
- rev = "04f547cc50da4c144c5fdfd4495aef143637a236";
- sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1";
+ rev = "v1.10.0";
+ sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04";
};
}
+
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
type = "git";
url = "https://github.com/olekukonko/tablewriter";
- rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279";
+ rev = "d4647c9c7a84";
sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
};
}
+
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
- rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
- sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+ rev = "v1.2.0";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
};
}
+
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "46c73eb196baff5bb07288f245b223bd1a30fba6";
+ rev = "46c73eb196ba";
sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
};
}
+
+ {
+ goPackagePath = "github.com/sanity-io/litter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sanity-io/litter";
+ rev = "v1.1.0";
+ sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "v1.0.0";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
+ rev = "86672fcb3f95";
sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
+
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
- rev = "787d034dfe70e44075ccc060d346146ef53270ad";
- sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+ rev = "v1.1.2";
+ sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
};
}
+
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+ rev = "v1.3.0";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
+
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
- rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483";
- sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9";
+ rev = "v0.0.3";
+ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
};
}
+
{
goPackagePath = "github.com/spf13/fsync";
fetch = {
type = "git";
url = "https://github.com/spf13/fsync";
- rev = "12a01e648f05a938100a26858d2d59a120307a18";
+ rev = "12a01e648f05";
sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
};
}
+
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
- rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2";
- sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17";
+ rev = "94f6ae3ed3bc";
+ sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
};
}
+
{
goPackagePath = "github.com/spf13/nitro";
fetch = {
type = "git";
url = "https://github.com/spf13/nitro";
- rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
+ rev = "24d7ef30a12d";
sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
};
}
+
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b";
- sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c";
+ rev = "v1.0.2";
+ sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
};
}
+
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9";
- sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b";
+ rev = "v1.2.0";
+ sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47";
};
}
+
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "f2347ac6c9c9";
+ sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm";
+ };
+ }
+
{
goPackagePath = "github.com/tdewolff/minify";
fetch = {
type = "git";
url = "https://github.com/tdewolff/minify";
- rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46";
- sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f";
+ rev = "v2.3.6";
+ sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb";
};
}
+
{
goPackagePath = "github.com/tdewolff/parse";
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
- rev = "dd9676af8dd934a61082c5b3038e79626847fa32";
- sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk";
+ rev = "fced451e0bed";
+ sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3";
};
}
+
+ {
+ goPackagePath = "github.com/tdewolff/test";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tdewolff/test";
+ rev = "v1.0.0";
+ sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
+ };
+ }
+
{
goPackagePath = "github.com/wellington/go-libsass";
fetch = {
type = "git";
url = "https://github.com/wellington/go-libsass";
- rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf";
+ rev = "615eaa47ef79";
sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s";
};
}
+
{
goPackagePath = "github.com/yosssi/ace";
fetch = {
type = "git";
url = "https://github.com/yosssi/ace";
- rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515";
- sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma";
+ rev = "v0.0.5";
+ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
};
}
+
{
goPackagePath = "golang.org/x/image";
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458";
+ rev = "c73c2afc3b81";
sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz";
};
}
+
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "922f4815f713f213882e8ef45e0d315b164d705c";
- sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w";
+ rev = "161cd47e91fd";
+ sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";
};
}
+
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+ rev = "1d60e4601c6f";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
+
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5";
- sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy";
+ rev = "d0be0721c37e";
+ sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
};
}
+
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "6e3c4e7365ddcc329f090f96e4348398f6310088";
- sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
+
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ rev = "v2.2.1";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index a714cdbb0d0..6841bc14c38 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.1)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -23,7 +23,7 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.8.4)
+ jekyll (3.8.5)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -47,14 +47,14 @@ GEM
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
- jekyll-watch (2.0.0)
+ jekyll-watch (2.1.2)
listen (~> 3.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.17.0)
- liquid (4.0.0)
+ liquid (4.0.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@@ -62,18 +62,18 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
- nokogiri (1.8.4)
+ nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
- pathutil (0.16.1)
+ pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
- rouge (3.2.1)
+ rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
- sass (3.5.7)
+ sass (3.6.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -96,4 +96,4 @@ DEPENDENCIES
rouge
BUNDLED WITH
- 1.16.3
+ 1.16.4
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 7ab1c70a98b..d680f925590 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -28,10 +28,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+ sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0";
type = "gem";
};
- version = "1.0.5";
+ version = "1.1.1";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -104,10 +104,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
+ sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
type = "gem";
};
- version = "3.8.4";
+ version = "3.8.5";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -158,10 +158,10 @@
dependencies = ["listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+ sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.2";
};
jemoji = {
dependencies = ["gemoji" "html-pipeline" "jekyll"];
@@ -183,10 +183,10 @@
liquid = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+ sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw";
type = "gem";
};
- version = "4.0.0";
+ version = "4.0.1";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
@@ -225,19 +225,19 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+ sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
type = "gem";
};
- version = "1.8.4";
+ version = "1.8.5";
};
pathutil = {
dependencies = ["forwardable-extended"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+ sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
type = "gem";
};
- version = "0.16.1";
+ version = "0.16.2";
};
public_suffix = {
source = {
@@ -267,10 +267,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+ sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.0";
};
ruby_dep = {
source = {
@@ -292,10 +292,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
+ sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh";
type = "gem";
};
- version = "3.5.7";
+ version = "3.6.0";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 01e4f368223..5fe2d108500 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.1)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -34,7 +34,7 @@ GEM
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jekyll (3.8.4)
+ jekyll (3.8.5)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -68,14 +68,14 @@ GEM
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
- jekyll-watch (2.0.0)
+ jekyll-watch (2.1.2)
listen (~> 3.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.17.0)
- liquid (4.0.0)
+ liquid (4.0.1)
liquid-c (3.0.0)
liquid (>= 3.0.0)
listen (3.1.5)
@@ -90,11 +90,11 @@ GEM
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.8.4)
+ nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
- octokit (4.12.0)
+ octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
- pathutil (0.16.1)
+ pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
pygments.rb (1.2.1)
@@ -105,10 +105,10 @@ GEM
rdiscount (2.2.0.1)
rdoc (6.0.4)
redcarpet (3.4.0)
- rouge (3.2.1)
+ rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
- sass (3.5.7)
+ sass (3.6.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -152,4 +152,4 @@ DEPENDENCIES
yajl-ruby (~> 1.3.1)
BUNDLED WITH
- 1.16.3
+ 1.16.4
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 3e92d3f28a0..4e33cd6ccdc 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -62,10 +62,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+ sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0";
type = "gem";
};
- version = "1.0.5";
+ version = "1.1.1";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -163,10 +163,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
+ sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
type = "gem";
};
- version = "3.8.4";
+ version = "3.8.5";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -261,10 +261,10 @@
dependencies = ["listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+ sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.2";
};
jemoji = {
dependencies = ["gemoji" "html-pipeline" "jekyll"];
@@ -286,10 +286,10 @@
liquid = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+ sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw";
type = "gem";
};
- version = "4.0.0";
+ version = "4.0.1";
};
liquid-c = {
dependencies = ["liquid"];
@@ -370,28 +370,28 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+ sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
type = "gem";
};
- version = "1.8.4";
+ version = "1.8.5";
};
octokit = {
dependencies = ["sawyer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh";
+ sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6";
type = "gem";
};
- version = "4.12.0";
+ version = "4.13.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+ sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
type = "gem";
};
- version = "0.16.1";
+ version = "0.16.2";
};
public_suffix = {
source = {
@@ -454,10 +454,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+ sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.0";
};
ruby_dep = {
source = {
@@ -479,10 +479,10 @@
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
+ sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh";
type = "gem";
};
- version = "3.5.7";
+ version = "3.6.0";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 4f98ec1bba9..f529fa395d9 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "14289";
+ version = "14382";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb";
+ sha256 = "1a2nx9jr1fvw95gdvl9kj3z0cs6ndafm0k4l0lwfx9p9qn4lgzjg";
};
- buildInputs = [ jre10 makeWrapper ];
+ buildInputs = [ jdk11 makeWrapper ];
desktopItem = makeDesktopItem {
name = "josm";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar
- makeWrapper ${jre10}/bin/java $out/bin/josm \
+ makeWrapper ${jdk11}/bin/java $out/bin/josm \
--add-flags "-jar $out/share/java/josm.jar"
mkdir -p $out/share/applications
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index b94d067dd18..bc2c8978a67 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,22 +1,6 @@
{ stdenv, pkgs, python3 }:
-let
- python = python3.override {
- packageOverrides = self: super: {
-
- # https://github.com/pimutils/khal/issues/780
- python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
- version = "2.6.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
- };
- });
-
- };
- };
-
-in with python.pkgs; buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
pname = "khal";
version = "0.9.10";
@@ -50,6 +34,9 @@ in with python.pkgs; buildPythonApplication rec {
install -D misc/__khal $out/share/zsh/site-functions/__khal
'';
+ # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3
+ doCheck = false;
+
checkPhase = ''
py.test
'';
@@ -58,6 +45,6 @@ in with python.pkgs; buildPythonApplication rec {
homepage = http://lostpackets.de/khal/;
description = "CLI calendar application";
license = licenses.mit;
- maintainers = with maintainers; [ jgeerds ];
+ maintainers = with maintainers; [ jgeerds gebner ];
};
}
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 8d095b78cdb..9ea8210e67e 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -103,5 +103,8 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ robbinch ];
+ knownVulnerabilities = [
+ "CVE-2015-1032"
+ ];
};
}
diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
new file mode 100644
index 00000000000..3950e4945cf
--- /dev/null
+++ b/pkgs/applications/misc/mako/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, systemd, pango, cairo
+, wayland, wayland-protocols }:
+
+stdenv.mkDerivation rec {
+ name = "mako-${version}";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "emersion";
+ repo = "mako";
+ rev = "v${version}";
+ sha256 = "18krsyp9g6f689024dn1mq8dyj4yg8c3kcy5s88q1gm8py6c4493";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+ buildInputs = [ systemd pango cairo wayland wayland-protocols ];
+
+ meta = with stdenv.lib; {
+ description = "A lightweight Wayland notification daemon";
+ homepage = https://wayland.emersion.fr/mako/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ dywedir ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch
index 7466fc2ca62..be1b84b0012 100644
--- a/pkgs/applications/misc/mupdf/darwin.patch
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@@ -1,47 +1,30 @@
-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 $@
+diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules
+--- mupdf-1.14.0-source.orig/Makerules 2018-11-02 06:57:12.114012496 +0100
++++ mupdf-1.14.0-source/Makerules 2018-11-02 10:11:56.717232992 +0100
+@@ -80,13 +80,6 @@
+ 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 = xcrun ranlib
-
--# Linux uses pkg-config for system libraries.
--else ifeq "$(OS)" "Linux"
+-else ifeq ($(OS),Linux)
+- HAVE_OBJCOPY := yes
+
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -119,12 +112,6 @@
+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+ endif
+
+- HAVE_GLUT := yes
+- ifeq ($(HAVE_GLUT),yes)
+- SYS_GLUT_CFLAGS :=
+- SYS_GLUT_LIBS := -lglut -lGL
+- endif
-
- 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.1.0' && 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/platform/gl/gl-main.c b/platform/gl/gl-main.c
-index d58f7ba..808af18 100644
---- a/platform/gl/gl-main.c
-+++ b/platform/gl/gl-main.c
-@@ -16,6 +16,7 @@ void glutExit(void) {}
- void glutMouseWheelFunc(void *fn) {}
- void glutInitErrorFunc(void *fn) {}
- void glutInitWarningFunc(void *fn) {}
-+#define glutSetOption(X,Y)
- #endif
-
- enum
+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+ ifeq ($(HAVE_X11),yes)
+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index bce2a79cde3..d4f59272c9c 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
+{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, openjpeg
, jbig2dec, libjpeg , darwin
, enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl
@@ -14,23 +14,17 @@ let
in stdenv.mkDerivation rec {
- version = "1.13.0";
+ version = "1.14.0";
name = "mupdf-${version}";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
- sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707";
+ sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
};
- patches = [
- (fetchpatch {
- name = "CVE-2018-10289.patch";
- url = "https://bugs.ghostscript.com/attachment.cgi?id=15230";
- sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q";
- })
- ]
+ patches =
# Use shared libraries to decrease size
- ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
+ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
;
@@ -38,7 +32,7 @@ in stdenv.mkDerivation rec {
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
'';
- makeFlags = [ "prefix=$(out)" ];
+ makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
deleted file mode 100644
index e29f1f52077..00000000000
--- a/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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,10 +312,10 @@
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
--THREAD_LIB = $(OUT)/libmuthreads.a
--PKCS7_LIB = $(OUT)/libmupkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdfthird.so
-+THREAD_LIB = $(OUT)/libmuthreads.so
-+PKCS7_LIB = $(OUT)/libmupkcs7.so
-
- MUPDF_OBJ := \
- $(FITZ_OBJ) \
-@@ -343,13 +343,17 @@
- $(ZLIB_OBJ) \
- $(LCMS2_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
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
-
- # --- Tools and Apps ---
-
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
new file mode 100644
index 00000000000..131a1bbbf6b
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
@@ -0,0 +1,39 @@
+--- mupdf-1.14.0-source.orig/Makefile 2018-11-02 06:57:12.114012496 +0100
++++ mupdf-1.14.0-source/Makefile 2018-11-02 09:57:10.067945307 +0100
+@@ -20,7 +20,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
+
+ ifneq ($(threading),no)
+@@ -190,17 +190,21 @@
+
+ # --- Library ---
+
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdf-third.so
++THREAD_LIB = $(OUT)/libmupdf-threads.so
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
++ $(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so
+
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
+
+ # --- Main tools and viewers ---
+
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 7068d8aedd3..daeb8b159f7 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -13,12 +13,12 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "8.0.12";
+ version = "8.0.13";
name = "${pname}-${version}";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
- sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82";
+ sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj";
};
patches = [
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index d97f2d2c048..051e7139a23 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
- version = "1.9";
+ version = "2.0";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
- sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg";
+ sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index 59ba45e6f37..09c49135ca1 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite
, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "notejot";
- version = "1.4.5";
+ version = "1.4.7";
name = "${pname}-${version}";
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
- vala
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = [
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee
granite
gtk3
@@ -39,9 +40,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Stupidly-simple sticky notes applet";
- homepage = https://github.com/lainsce/notejot;
- license = licenses.gpl2Plus;
+ homepage = https://github.com/lainsce/notejot;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 8a941a719f2..95a2f2b940c 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, cmake, gcc-arm-embedded, python
+, cmake, gcc-arm-embedded, binutils-arm-embedded, python
, qt5, SDL, gmock
, dfu-util, avrdude
}:
@@ -21,10 +21,12 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ gcc-arm-embedded binutils-arm-embedded
+ ];
buildInputs = with qt5; [
- gcc-arm-embedded
python python.pkgs.pyqt4
qtbase qtmultimedia qttranslations
SDL gmock
@@ -40,6 +42,7 @@ in stdenv.mkDerivation {
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
+ "-DNANO=OFF"
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix
new file mode 100644
index 00000000000..fcf88200133
--- /dev/null
+++ b/pkgs/applications/misc/pbpst/default.nix
@@ -0,0 +1,49 @@
+{ llvmPackages, stdenv, fetchFromGitHub
+, python36Packages, which, pkgconfig, curl, git, gettext, jansson
+
+# Optional overrides
+, maxFileSize ? 64 # in MB
+, provider ? "https://ptpb.pw/"
+}:
+
+llvmPackages.stdenv.mkDerivation rec {
+ version = "unstable-2018-01-11";
+ name = "pbpst-${version}";
+
+ src = fetchFromGitHub {
+ owner = "HalosGhost";
+ repo = "pbpst";
+ rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346";
+ sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm";
+ };
+
+ nativeBuildInputs = [
+ python36Packages.sphinx
+ which
+ pkgconfig
+ curl
+ git
+ gettext
+ ];
+ buildInputs = [ curl jansson ];
+
+ patchPhase = ''
+ patchShebangs ./configure
+
+ # Remove hardcoded check for libs in /usr/lib/
+ sed -e '64,67d' -i ./configure
+ '';
+
+ configureFlags = [
+ "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes
+ "--provider=${provider}"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A command-line libcurl C client for pb deployments";
+ inherit (src.meta) homepage;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tmplt ];
+ };
+}
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 0c358e4221a..9756e8ca6c4 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -64,10 +64,15 @@ stdenv.mkDerivation rec {
(if i3Support || i3GapsSupport then makeWrapper else null)
];
- fixupPhase = if (i3Support || i3GapsSupport) then ''
- wrapProgram $out/bin/polybar \
- --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
- '' else null;
+ postConfigure = ''
+ substituteInPlace ../include/settings.hpp --replace \
+ "${stdenv.cc}" "${stdenv.cc.name}"
+ '';
+
+ postInstall = if (i3Support || i3GapsSupport) then ''
+ wrapProgram $out/bin/polybar \
+ --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
+ '' else "";
nativeBuildInputs = [
cmake pkgconfig
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index c1b1cfb48a2..6f056292d77 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -3,47 +3,51 @@
, gettext
, libxml2
, pkgconfig
-, gtk3
+, glib
, granite
+, gtk3
, gnome3
-, cmake
+, meson
, ninja
-, vala
-, elementary-cmake-modules
+, gobjectIntrospection
+, gsettings-desktop-schemas
+, vala_0_40
, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "regextester-${version}";
- version = "0.1.7";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "artemanufrij";
repo = "regextester";
rev = version;
- sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n";
+ sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3";
};
- XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
- "${granite}/share"
- "${gnome3.libgee}/share"
- ];
-
nativeBuildInputs = [
pkgconfig
- wrapGAppsHook
- vala
- cmake
+ meson
ninja
gettext
+ gobjectIntrospection
libxml2
- elementary-cmake-modules
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
+ wrapGAppsHook
];
buildInputs = [
- gtk3
+ glib
granite
+ gtk3
+ gnome3.defaultIconTheme
gnome3.libgee
+ gsettings-desktop-schemas
];
+ postInstall = ''
+ ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
meta = with stdenv.lib; {
description = "A desktop application to test regular expressions interactively";
homepage = https://github.com/artemanufrij/regextester;
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 89b4e33a927..24f4cbfe8ef 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
let
- version = "0.6.2";
+ version = "0.6.3";
sqlGda = libgda.override {
mysqlSupport = true;
postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
owner = "Alecaddd";
repo = "sequeler";
rev = "v${version}";
- sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7";
+ sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 7df4007cf40..cc9133257a0 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -33,7 +33,7 @@ let
in
stdenv.mkDerivation rec {
name = "slic3r-prusa-edition-${version}";
- version = "1.41.0";
+ version = "1.41.1";
enableParallelBuilding = true;
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "Slic3r";
- sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d";
+ sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy";
rev = "version_${version}";
};
diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
index 6230f2f6f6a..90639fc5705 100644
--- a/pkgs/applications/misc/soapysdr/default.nix
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -6,7 +6,7 @@
} :
let
- version = "0.6.1";
+ version = "0.7.0";
in stdenv.mkDerivation {
name = "soapysdr-${version}";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
owner = "pothosware";
repo = "SoapySDR";
rev = "soapy-sdr-${version}";
- sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9";
+ sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix
new file mode 100644
index 00000000000..52e39b98a3b
--- /dev/null
+++ b/pkgs/applications/misc/tabula/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip, jre, makeWrapper }:
+
+
+stdenv.mkDerivation rec {
+ name = "tabula-${version}";
+ version = "1.2.1";
+
+
+ src = fetchzip {
+ url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip";
+ sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi";
+ };
+
+
+ buildInputs = [ makeWrapper ];
+
+
+ installPhase = ''
+ mkdir -pv $out/share/tabula
+ cp -v * $out/share/tabula
+
+ makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar"
+ '';
+
+
+ meta = with stdenv.lib; {
+ description = "A tool for liberating data tables locked inside PDF files";
+ longDescription = ''
+ If you’ve ever tried to do anything with data provided to you in PDFs, you
+ know how painful it is — there's no easy way to copy-and-paste rows of data
+ out of PDF files. Tabula allows you to extract that data into a CSV or
+ Microsoft Excel spreadsheet using a simple, easy-to-use interface.
+ '';
+ homepage = https://tabula.technology/;
+ license = licenses.mit;
+ maintainers = [ maintainers.dpaetzel ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index d15b8111fb0..d7a7de36877 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -7,7 +7,7 @@
let
pname = "tootle";
- version = "0.1.5";
+ version = "0.2.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
owner = "bleakgrey";
repo = pname;
rev = version;
- sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6";
+ sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
};
nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ];
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
deleted file mode 100644
index 5bb614ac68b..00000000000
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Requirements for Building TrueCrypt for Linux and macOS:
------------------------------------------------------------
-
-- GNU Make
-- GNU C++ Compiler 4.0 or compatible
-- Apple XCode (macOS only)
-- pkg-config
-- wxWidgets 2.8 library source code (available at http://www.wxwidgets.org)
-- FUSE library (available at http://fuse.sourceforge.net and
- http://code.google.com/p/macfuse)
-
-
-Instructions for Building TrueCrypt for Linux and macOS:
------------------------------------------------------------
-
-1) Change the current directory to the root of the TrueCrypt source code.
-
-2) Run the following command to configure the wxWidgets library for TrueCrypt
- and to build it:
-
- $ make WX_ROOT=/usr/src/wxWidgets wxbuild
-
- The variable WX_ROOT must point to the location of the source code of the
- wxWidgets library. Output files will be placed in the './wxrelease/'
- directory.
-
-3) To build TrueCrypt, run the following command:
-
- $ make
-
-4) If successful, the TrueCrypt executable should be located in the directory
- 'Main'.
-
-By default, a universal executable supporting both graphical and text user
-interface is built. To build a console-only executable, which requires no GUI
-library, use the 'NOGUI' parameter:
-
- $ make NOGUI=1 WX_ROOT=/usr/src/wxWidgets wxbuild
- $ make NOGUI=1
-*/
-
-{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
- wxGUI ? true
-}:
-
-stdenv.mkDerivation {
- name = "truecrypt-7.1a";
-
- patchPhase = "patch -p0 < ${./gcc6.patch}";
-
- preBuild = ''
- cp $pkcs11h pkcs11.h
- cp $pkcs11th pkcs11t.h
- cp $pkcs11fh pkcs11f.h
- '';
-
- makeFlags = [
- ''PKCS11_INC="`pwd`"''
- (if wxGUI then "" else "NOGUI=1")
- ];
-
- installPhase = ''
- install -D -t $out/bin Main/truecrypt
- install -D License.txt $out/share/$name/LICENSE
- '';
-
- src = fetchurl {
- url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
- sha256 = "e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc";
- };
-
- pkcs11h = fetchurl {
- url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h;
- sha256 = "1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b";
- };
-
- pkcs11th = fetchurl {
- url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h;
- sha256 = "8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b";
- };
-
- pkcs11fh = fetchurl {
- url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h;
- sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ fuse lvm2 wxGTK nasm ];
-
- meta = {
- description = "Free Open-Source filesystem on-the-fly encryption";
- homepage = http://www.truecrypt.org/;
- license = "TrueCrypt License Version 2.6";
- maintainers = with stdenv.lib.maintainers; [ ryantm ];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch
deleted file mode 100644
index 6e8c7da69e8..00000000000
--- a/pkgs/applications/misc/truecrypt/gcc6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200
-+++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200
-@@ -45,13 +45,13 @@
- strBuf.CopyFrom (res);
- return string (reinterpret_cast (strBuf.Ptr()));
- #else
-- static const char LanguageXml[] =
-+ static byte LanguageXml[] =
- {
- # include "Common/Language.xml.h"
- , 0
- };
-
-- return string (LanguageXml);
-+ return string ((const char*) LanguageXml);
- #endif
- }
-
-@@ -64,13 +64,13 @@
- strBuf.CopyFrom (res);
- return string (reinterpret_cast (strBuf.Ptr()));
- #else
-- static const char License[] =
-+ static byte License[] =
- {
- # include "License.txt.h"
- , 0
- };
-
-- return string (License);
-+ return string ((const char*) License);
- #endif
- }
-
---- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200
-+++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200
-@@ -414,11 +414,11 @@
- libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
-
- #ifdef TC_MACOSX
-- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
-+ extensions.push_back (make_pair (L"dylib", static_cast(LangString["DLL_FILES"].wc_str())));
- #endif
- if (!libExtension.empty())
- {
-- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
-+ extensions.push_back (make_pair (static_cast(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast(LangString["DLL_FILES"].wc_str())));
- extensions.push_back (make_pair (L"*", L""));
- }
-
---- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200
-+++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200
-@@ -1445,7 +1445,7 @@
- FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
- {
- list < pair > extensions;
-- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
-+ extensions.push_back (make_pair (L"tc", static_cast(LangString["TC_VOLUMES"].wc_str())));
-
- FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
-
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index dba492ca8dd..b406df5b1e2 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, python3Packages, hackrf, rtl-sdr }:
+{ stdenv, fetchFromGitHub, python3Packages
+, hackrf, rtl-sdr, airspy, limesuite }:
python3Packages.buildPythonApplication rec {
name = "urh-${version}";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
- sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz";
+ sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c";
};
- buildInputs = [ hackrf rtl-sdr ];
+ buildInputs = [ hackrf rtl-sdr airspy limesuite ];
propagatedBuildInputs = with python3Packages; [
pyqt5 numpy psutil cython pyzmq
];
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index bc5b19e7737..8b64bcca667 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,43 +1,38 @@
-{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
- wxGUI ? true
-}:
+{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "veracrypt-${version}";
- version = "1.22";
+ pname = "veracrypt";
+ name = "${pname}-${version}";
+ version = "1.23";
src = fetchurl {
- url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
- sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y";
+ url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
+ sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
};
- unpackPhase =
- ''
- tar xjf $src
- cd src
- '';
+ sourceRoot = "src";
- nativeBuildInputs = [ makeself yasm pkgconfig ];
- buildInputs = [ fuse lvm2 ]
- ++ optional wxGUI wxGTK30;
- makeFlags = optionalString (!wxGUI) "NOGUI=1";
+ nativeBuildInputs = [ makeself pkgconfig yasm ];
+ buildInputs = [ fuse lvm2 wxGTK ];
- installPhase =
- ''
- mkdir -p $out/bin
- cp Main/veracrypt $out/bin
- mkdir -p $out/share/$name
- cp License.txt $out/share/$name/LICENSE
- mkdir -p $out/share/applications
- sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop
- '';
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ install -Dm 755 Main/${pname} "$out/bin/${pname}"
+ install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm"
+ install -Dm 444 License.txt -t "$out/share/doc/${pname}/"
+ install -d $out/share/applications
+ substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \
+ --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \
+ --replace "Icon=veracrypt" "Icon=veracrypt.xpm"
+ '';
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";
homepage = https://www.veracrypt.fr/;
- license = "VeraCrypt License";
+ license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ];
maintainers = with maintainers; [ dsferruzza ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
new file mode 100644
index 00000000000..dd95b231bd1
--- /dev/null
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonApplication, lib, fetchFromGitHub
+, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
+}:
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "visidata";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "saulpw";
+ repo = "visidata";
+ rev = "v${version}";
+ sha256 = "1d5sx1kfil1vjkynaac5sjsnn9azxxw834gwbh9plzd5fwxg4dz2";
+ };
+
+ propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
+ lxml pandas pyshp ];
+
+ doCheck = false;
+
+ meta = {
+ inherit version;
+ description = "Interactive terminal multitool for tabular data";
+ license = lib.licenses.gpl3 ;
+ maintainers = [lib.maintainers.raskin];
+ platforms = lib.platforms.linux;
+ homepage = "http://visidata.org/";
+ };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c18f77f8f99..66198508606 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
+{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -92,11 +92,6 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";
- freetype_source = fetchurl {
- url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz;
- sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
- };
-
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
@@ -132,22 +127,28 @@ let
++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "71") at-spi2-core;
- patches = [
- # As major versions are added, you can trawl the gentoo and arch repos at
- # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
- # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
- # for updated patches and hints about build flags
- # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
- ./patches/fix-freetype.patch
+ patches = optional enableWideVine ./patches/widevine.patch ++ [
./patches/nix_plugin_paths_68.patch
./patches/remove-webp-include-69.patch
- ] ++ optional enableWideVine ./patches/widevine.patch
- ++ optional ((versionRange "69" "70") && stdenv.isAarch64)
- (fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch;
- sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7";
- })
- ++ optional stdenv.isAarch64
+
+ # Unfortunately, chromium regularly breaks on major updates and
+ # then needs various patches backported in order to be compiled with GCC.
+ # Good sources for such patches and other hints:
+ # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
+ # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
+ # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
+ #
+ # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
+ ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [
+ ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" )
+ ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" )
+ ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" )
+ ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" )
+ ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" )
+ ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" )
+ ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" )
+ ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" )
+ ] ++ optional stdenv.isAarch64
(if (versionOlder version "71") then
fetchpatch {
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
@@ -160,7 +161,7 @@ let
sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
}
);
-
+
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
@@ -193,11 +194,6 @@ let
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
- # use patched freetype
- # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733
- # FIXME http://savannah.nongnu.org/bugs/?51156
- tar -xJf ${freetype_source}
-
# remove unused third-party
# in third_party/crashpad third_party/zlib contains just a header-adapter
for lib in ${toString gnSystemLibraries}; do
@@ -213,13 +209,21 @@ let
'' + optionalString stdenv.isAarch64 ''
substituteInPlace build/toolchain/linux/BUILD.gn \
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
+ '' + optionalString stdenv.cc.isClang ''
+ mkdir -p third_party/llvm-build/Release+Asserts/bin
+ ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang
+ ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++
+ ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
'';
gnFlags = mkGnFlags ({
linux_use_bundled_binutils = false;
+ use_lld = false;
use_gold = true;
gold_path = "${stdenv.cc}/bin";
is_debug = false;
+ # at least 2X compilation speedup
+ use_jumbo_build = true;
proprietary_codecs = false;
use_sysroot = false;
@@ -230,7 +234,7 @@ let
use_cups = cupsSupport;
treat_warnings_as_errors = false;
- is_clang = false;
+ is_clang = stdenv.cc.isClang;
clang_use_chrome_plugins = false;
remove_webcore_debug_symbols = true;
enable_swiftshader = false;
@@ -243,8 +247,6 @@ let
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
google_default_client_id = "404761575300.apps.googleusercontent.com";
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
- } // optionalAttrs (versionRange "60" "70") {
- use_gtk3 = true;
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 686e8fadec3..88b0a89db4b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
+{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
# package customization
@@ -14,12 +14,13 @@
, commandLineArgs ? ""
}:
+assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
let
callPackage = newScope chromium;
chromium = {
- inherit stdenv;
-
+ inherit stdenv llvmPackages;
+
upstream-info = (callPackage ./update.nix {}).getChannel channel;
mkChromiumDerivation = callPackage ./common.nix {
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
deleted file mode 100644
index cc380a55abe..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/third_party/freetype/BUILD.gn
-+++ b/third_party/freetype/BUILD.gn
-@@ -63,10 +63,12 @@ source_set("freetype_source") {
- "src/src/base/ftbase.c",
- "src/src/base/ftbbox.c",
- "src/src/base/ftbitmap.c",
-+ "src/src/base/ftfntfmt.c",
- "src/src/base/ftfstype.c",
- "src/src/base/ftgasp.c",
- "src/src/base/ftglyph.c",
- "src/src/base/ftinit.c",
-+ "src/src/base/ftlcdfil.c",
- "src/src/base/ftmm.c",
- "src/src/base/ftstroke.c",
- "src/src/base/fttype1.c",
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
index 3c80dbcec00..da6a4c92b46 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
@@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644
return false;
cur = cur.Append(kPepperFlashBaseDirectory);
break;
-@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
- // We currently need a path here to look up whether the plugin is disabled
- // and what its permissions are.
- case chrome::FILE_NACL_PLUGIN:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
- return false;
- cur = cur.Append(kInternalNaClPluginFileName);
- break;
@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.DirName();
}
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c5622f0c63c..ed3a58f62db 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ stdenv, gcc
, jshon
, glib
, nspr
@@ -69,7 +69,7 @@ let
! find -iname '*.so' -exec ldd {} + | grep 'not found'
'';
- PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ];
+ PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
patchPhase = ''
chmod +x libwidevinecdm.so libwidevinecdmadapter.so
@@ -110,7 +110,7 @@ let
patchPhase = ''
chmod +x libpepflashplayer.so
- patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so
+ patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so
'';
doCheck = true;
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a26c8b8ddde..8162f43776d 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 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp";
- sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5";
- version = "70.0.3538.35";
+ sha256 = "0kkdfp5f3gmzngfj1nfw023bpyvm47h94k9rpwml2kxlijswd1gl";
+ sha256bin64 = "13ghx5ysl8f2iphdvjh698q4jksh765ljjrd74m6x0ih6qm0ksaq";
+ version = "71.0.3578.20";
};
dev = {
- sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv";
- sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968";
- version = "71.0.3559.6";
+ sha256 = "1d7q8hbqbxy2izdvv4d9126ljiglsfc3w7wns3zbbbiyqa2rj00y";
+ sha256bin64 = "0v6yahsvsgxcqg6k84lgr589rnx9af1r2axn7cggyn1a2lk63jck";
+ version = "72.0.3590.0";
};
stable = {
- sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3";
- sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q";
- version = "69.0.3497.100";
+ sha256 = "0j84556r3m4igigqsx9zvw4kvbn4psfsi7m8xhcvfxc39ingh569";
+ sha256bin64 = "082cf9d1wm36w4i09ai4xnprvxfqdar6cbgsxz5q5srd41mqdy6p";
+ version = "70.0.3538.77";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 6633c6d22d9..2089b1c5e22 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
{
- version = "63.0b14";
+ version = "64.0b5";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "23bf5d5195c7678ec4bdcb1c4caa46e2681031213cce0239509e4999c81ad196c8c3cc77720f83154ff4f60ac161c01d0f8fb0c22655777325f67ee7cf31b4a1";
+ sha512 = "d57da255abe658e1b5fdb2156fe737d3ecd996320a554d67dc9de038cc6065a9798009de94c0d3530f6cadda044578772d13a6a2647d71e4e52507d4b4ff0b8f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "7e8983fd49deae14281a400ad15146ab27abd9e2f7b3cb060734f2538519541bfe0c20411df35baa836f62a176955edc005755b4359eb66a661e73c75e72a04f";
+ sha512 = "09f84b78c77d888724c5b66c69d4ca266568b70f861e858a978ebadf592c0fd341f338792ec13a95ac0a8518442ef8db6eb1e3cf34154c9473c739367c2b3c83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "3542bceed63d08bb955cb089fc29c3d49b0f60ee5dcaed70bee27f1b340b3e34706e64079a5496c4c11cd99ff8ade790a7105b22f9a13a2aad8a0dfca80690b8";
+ sha512 = "809d1de6ad2e9b488b8e327ec0e76ba412f63a52c7959ed6770b724cfd295f1d2abb0f2e3a30ad688b3c35b7c67aa7b3bb17c22c55219c136172fdac46bb0a88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "010a259bc60e823417411ac9cfc35597fc7a5ba997ae30d2f5359194720e7dafacac152def59cb755ea658d581d2a19e434c5863cc837c43d478454837910811";
+ sha512 = "2d712f71aa187e378ebe7a19288e9ace821485e49787c5c52c9e7bba5d363f026625762e3a3cefea3edee519afb8854068ada726961f1c3722f2dc8dc1fb4a28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "a78ded1af77b7ef20c319022d94275a8843995bbb279b3570f7d389692287af5f7e50f1a5bc3da46ab60300f5f9fe43396d577170c7bdf950bb38e2433a97b1d";
+ sha512 = "fa664a245fa86dff7a49bd03514568373b571681efa6a04a6c45d2168aa50700f0c9a5c0616ac05063cdfc015326d88c703799e2f267db0d62a565a4c6963630";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "97891240277fb80a206c5bea6e9e2edf98adae043bd68b421ff92339c8857084a5261b91bb672485fdda4ccea31a5b37230a94d760fe35390dc9736e8dff4163";
+ sha512 = "922e914bf58ee148e7c2abe9390389306b8ca9414f1dd6eed1615b4ef76cb2e872432a81103b3f4ae9a89dae5341d079c7d7ab511af0377a5bfd62405a379957";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "fb31a2b02c901f1b52b8a46b80c6118a2689fb4567f64c9ce963dbca2c106983a1e1fe56bd428e3aec381f85136f4914e1c57692bd4a021a5204059232bb74e3";
+ sha512 = "fd7a9089521c2fc3a94b026e7ddf795b48020b97acc5b2b0e3a20c0cdacabb51b5711a9ac784a43c506c477ae6fd0e2628774f4239dc8d190cf6f4f555f08076";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "2efdeae4f09e12b99528f6370e3486630224e0d5baf19df62e79a890f03c2d512c81dc60963d537c128f3749d7d9fa73f2bd44e65563261f4c3850e75a7f3eee";
+ sha512 = "d199ed2918061c39a2cbbd18277812b15b08090aea8e87d740617b46fbd5dcae172bf8fd4b1ef71695171f530db73df05c8eab0f9c60691318d10217dafd8d4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "066ea34c198e13ed78c4b48c6b4d751c3fda1d42d9470a7295982d9510e23d17ec0a937a49b5403bdfcfe8bcddde16438dba0879759ec362f26a4583b435b448";
+ sha512 = "c5c36e85090df048fdf18dec0374371139b1948a532c9b5e71109d517ad44bd91c150efcbd9e8a7588a8e4cbcff38f9e67640d4f812aae694720510aad19397e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "3d25f71604d83984c0c86eb9fa27fa3bfc35631087cac1bae4ba2a773b6c870ed2bf81167633757108b631a18506255a0bc8e9dd4160b8cb35960efd987c9bb1";
+ sha512 = "6fa41190dcd2fe25c494e7b259aeca89d9482162221d2244883c945a95a035872810deb0b14acc3fe0f0b29ec1eb6d809e2bf58bec72787d67cfa2722ea6916a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "be90418ef58e6005086919dc89ba6168654a6bfde2dc87001a8092174e2b38d8695a70d7d1afdd75307db332785b5248e4b2d38facb6f9a7884d6483c8ab6c2e";
+ sha512 = "3c32deb94bab358c04f09106410c7191f42727fb7414ed64f835c28ad69f7f09cbdb2c040f1cd2c5cd15ed3ba704d1454ae11947bc1e6bff5f6123ed7b0783a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "b8dfee8bafd5b1ae7edb061c04b66ba63cd2421da54780499b947b4cf13721cc8cf7ed1ea06409a6a30dc831bedbbc648ac3a123d994ad676061edd10e7e1478";
+ sha512 = "d8c21bd0b7c6317dd565f0015e5749cfe668b586b0b05ae8a9e7cec9a9dd8ca0396c610ac4ae864d1e5a06d92c313bdd6b538eb1d8665a5e2982259b62f8ac29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "402898f9b309d56ffba067d7cf607b56b01d7df80fc8eb60fd04f6d659e4e473b3c2553238bc63a4372059d7841eded51f4f80de602104a6a52ec34cd2a6eedc";
+ sha512 = "a09f1a588086f043e3cf2efc3fdcd871e4423602138b7dc5340e02fc628c5b6cefa914d5b892712687b406a8590590dd9c74b3eb3509f2b228b2ca6e5dc7cadd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "233640ecd9dc6847ee9a538563fb3668a851aad7ac0216c09a31c62151c31cd6afa3ce84c36558aea39ead48a85d4270f0a4bc64701d699ead668f687c0e8e28";
+ sha512 = "ecd98bae1ef23c69055c8bad7bd4dba9d495679417f260dcf57e201341f418e1596927a9ea0f80ee04c4148442d911c4602769a5fd15e36f17497954c4610f29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "e326c1e011f9a58b40a026853c2d1d34ef45090a2f86d69aab46d358c2e3a42367424bba49d4c93fe92cf27c8bcc4d802084b28432b550b3c1e3098f37b72fd2";
+ sha512 = "2843e23ab8023a3d407de510f47f8c4ee2d1b0450672c81ebd01b262965bd26d9deb0b108762d5057ce4519d3f18af82b7b3f9184cad57a94c37134848d04963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "efc79e7384761d996a9ac636dccfcab32f4d14cdff218eb3c0161957b8a659ced0ebddd2ed0bc9dcc915ebb863ee8054b1f8bc6f16666f42421e4982682f97d5";
+ sha512 = "e1df39ee230751c1cea28a9bd0935ac5c0ae5517774db76a9ad338f79fd5edecc20fdcfd868e90644af898d5a008ced4b4a63367966ae11280b891d50d3c4d6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "89d06350b5fe8c83bc23b69620c7b6707d2e35981031783ad41cec728e41b842f990d7acfe2ba9e0298f0955f11f54d7c6551752e9f51e5b563a553001fc27fe";
+ sha512 = "d16f5d66184ae187e146f79771275b143c783d01e89b0ff12253dd4820f740c76e0310941d7fb3c3a54b3be70dedb67f627b17cb569c23560edef2cd05186d8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "103c34d736307f91e4e4343ad0b5f3ebbcc1efbca660782768ca20bc7a2cdada2fa40382f46ee57d70499529819f000eebc3e5d62c53ee5bd5f15437a18be6ea";
+ sha512 = "81b9ab64c69aed8d7a28c37e02064ec274d8e11228d950ab82f53add745ec8bd628e1c9ee18157399460a93e737f4c96fb2552fffa24517e58221c9d0d13d0dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "6a5e6e92fcc85846b3c92d34694e30672399d9a2821a9107f5a00942bd90e0e351ac6de435709149647cf94943c5f07fad834f7925682f0c0668f4c29b4644e4";
+ sha512 = "34352a5aec883dde7f263778722f59bb72c28b2381f3b81a68bd0e1062e8cc4a595a890085358b48a56ed76c38cd3b12c2f76c01a00c23cd0b98afc9f00a259e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "bbe625995bf300b561fe55210f396d4131bbcadc33c707051b226115cde5982f52520cd815a857542535e5787df210d612493deef50df5e361108db27ee86478";
+ sha512 = "edcc41a36f620a631ddf6c2aa926b85e1b977994f60883495089155e987288ef9d861634b7d559b304f38f7dd624e9557c6c998152062b4b2e671b4bafad5103";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "6b5ea1e59bca7b531728c70ecb644969a33955fa1975b7c9d03b550389f8fcb24de45d041df59e44d5a4cd66c8caa98725d2349d5b6c45da8f9cba917528d1a8";
+ sha512 = "10c06c9b11753787f6433c736fd68280892ff038154e0a62b4bc409dd5d35eba2fc0fd02c8ead4214d668bf30b3507b3fcae498d5f56d24941177b743fdaa156";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "ffbf1ea4c01004c435d12ae5b0309f3a60df116df371255d53e252cc3d3e220b154b9f32fc81c6868dd20108ac9d35cb79e4b2402cb62948408288d9cff774a4";
+ sha512 = "60755157a2726db341fc0c2daa9babea85507e0744845c1b0d6457b8b6fca7343ad68e8240d46a17c2292d0041e0054a1a404713902207f5dbe6ca7341d521d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "7649d91b6d454992d457a3152f066c8c76375bca41ed6101fb5f2dc700f5c5a9adb0c560b5abc5a8e21135e5d2abe577d286e64e77a11fc4d14f0a95a367e371";
+ sha512 = "ad87069011210e8362b36451666a69df663b565ae6bd7382fab6e84b25e924965d1fbbc1187b0456fe79ec096df65c12b147a2eb80fcf5f3d192b5df738ae53e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "068297ed38ee0ebe823069a823a46a3b871528b36815324a7ef514967e2e640f9277373cf1841df5ee64a24d3909bf317ab6d6e70670c4067a2d1a8caaa4f0ea";
+ sha512 = "4244650468d15ae708ad32b5a6f2165ebb29879207e3689404194be772ba0eb93354a48938d39017db873e902aa4ff30f6f39d4224e8e4423035c7d938b18df0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "5f50d62bc6fba7dc71169e5f7c2dd66c0a654c150d29b51a33333147e536eba671b0778ed66e08ef49d8399f3b77a34f31b90cc5ff47e8d6a779bad29d402974";
+ sha512 = "91525be6b8f404a8a062c2dc8ed63f89e29b44bbf5d899e5b3d5f71f912f98f3df504b48c1a932e6e140a36dbef9fc00d28b7a229e3f833699e5af1c08a62732";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "341bdf9ec2185e353c27e8037dfeb427c189214964766b4191e1b2b85cfd713a8ec7cd000d2f52d347a605fd41608a574a56f1334ceb8c1cf11fb51ab2e4c7c0";
+ sha512 = "1bf1eebd0e31587ab0675f11cdd1e4b36995e4adc7bb5c53c7a45e76453fef4b89b03a00c48c00f896c6fdfed54fa8f3f9ad06843ede961130c8667fd4fa2e2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "6c92fc52e6b63e9fc14161d20e90d58551f7b062682fc12fb40491fead1c042f21bb0e4cd241f6bbc63df865bc28b60177508275b46f340d9438707431c74a74";
+ sha512 = "74d99d3c19cca9bf6b4e3dd3cbd7d95d04519e4493fd17a0c29dd9fc38f110f05dfdd33a266cd5803095461103bbf026e88b2ee2fe734442ed41a3da61562798";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "85ab9fbf84396f15c7d3fa350b9da367aa3e13550a4f936f6578333216c828913635c18f19eda04c31ff8ecd511330aaa9b3499aa86c5113981e91de5ce3ffa3";
+ sha512 = "809eb23b5a1ba49fc7c646daf3775072303be1d9f184845b424a63e3a13425df395afbbe44b00e808837581e7fb5e81a557b6e0589339e776de009add9c0b578";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "78fb7a9d8bba35aeb3ca6c4a28ee92cebefdbcf84a1d169bcdde659d9dcbf4f7770e0a0a5f448b38a9cfa4f8dbe780fd324ccb904d0a16bd44ce82ce1c51942b";
+ sha512 = "05dca4924b2c2f546b550a74b9c70d9b6fa38970f26bc4bb19ee498bff1355d323584f8b1fa3f240aba857a3568fb951978e706fe501a45c2d9289b85b3354ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "e354e8cb44f9ca53df613d40b3c80f3e1c29900d3a1b7c72ffe886d4160e76c7b692ba9e047616e1526aadae8e72050752b4bf310d73f19beebf6533a2f3a160";
+ sha512 = "fb0cd125bfb46aa056e37a7930d8a75b92f94a3359033d126c475ae1c62dbf0263b46de19dc2dc37c710e2d8bb40d990b9c0b9682721ca88c5383722618a16f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "68ba92cc0e8d26177884f921239dcbfb43642cf145a8445b22e3f2d0d8b34a2755c68bfd00ba3a05763b9606d27b4a13b8bcd91553e4f6aebf3920bb64eb5a59";
+ sha512 = "a96f9d351e82e4b418ae0e05ec983eb81fc405238ecc5605d771333dbcb6a2f067c8b37953fced024abf9605457217a5726766e7a23e05d0f24dda8fa6fbb9ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "d140d0fdae10e801203e490b4ad6816393e88a55f1caa1b4e76e11cfa4eb48360f43331ff7c544061a24d9c9f0df91a3ddb39c0926eabd8a2a85a16aa95ca8bf";
+ sha512 = "74e40c64a7105a373194905ff6610396258f49ecb6a7785d4f166181e6230632bf1afa441a59e2491cb30cf289237f1c6d5f13c6e6780a0d0e74e165729f6bcd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "f9895dafc082cb31f74f6f467b59be3e161ebab65a191cd2bd8432e67615280c9d37db3b57d949290c3abf1d50911370d12fb40ac77f1f178608124f1d298071";
+ sha512 = "1a4276b4154ef450aaf751bf37421a7504b8ff5f62e0f6f93bb550936c0833e4f271c8fd288ab8dbc5a6e0f07de36baeb86ce2531bde0d3202414efd73907610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "051ea2a565519497f481f2270290eddbd4f698e6bb9a9777ba49bc751b3069b04961ed67314512727404bcb23d8411be967261b3be54b2f8be2a2f4379688ef9";
+ sha512 = "c9f55ea688d3ab90b29d9b4b4cca07d9b9f01afdc69c2be3c88f8bcc98928a9696d956a560d1df2f7dbd834814a75b254e6e1927e28d97c465956be6f6cb43fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "813c556ebe83639558f2af959cece13e3940ddd51826fdc0afaf7ce4142f78d07e6454dffe76d57e78dbf7e0479a64024b3720529eb032260509e51f72ac4372";
+ sha512 = "8f798f71a5914ae5db3f3e1fde8025f09a08f6f77548f8d40bc05591ec3ae890cb7a61f6ba53c6e29af945aca178ace8e51079c5c47ae520935157f02e2043b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "b63c2db2f5c115aaf2dc4f784d0ee194ab5647e493e64f315557023241d93c7228e4a94f8a7ab9521956a1ad8d811c5b8b7adcb34bf241a0eb2ff28e87472700";
+ sha512 = "802d7fd021acf040e85ea4e54b7bbd907c3b9c42b98fa026034430344b521fee7e20f8f7d3aff87d2b28d8b2df811ee29fdae323df8cea2c672dfb8a03217c05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "eef5fa19a954138a97c7f14371bf53b66eecab4e932b559cb241d885414db578d90ddbb835450589cde6ac97937c9946c7abfe37f2808c7141b46730f899980a";
+ sha512 = "6b9345cb60dc071071a7ec6b16d09938456d4838f7a274e3de7a3a4fde868a5594e4801e10ce2f534f4977af63db8d05f932dea978d2ba88282a18fc5cc1c618";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "5e5ba8b843dcf7d9beb2f27482bc7269d4b3488aadfae0f55fb2cb88d78ef11734255b557699539fa91a772c44c27366faf5d004221b523636d101d6c11a6be6";
+ sha512 = "a85726d6d2bfd4088de935151b7e27763b6146c9c437ba357aebd1f4c199ff353c777e24ed4fa2515715b707904cb745eceeff2fc4e24064b7b01b5be68ad269";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "f69b169d9e1fc361ef762c2c6e23e6974e525b984d05d61364aaa1e08d7f71ecec333bed1e5f6e923ed19e6f733add637b6915ba28d6751273f75bea02f6a285";
+ sha512 = "84c7b922984470ea266bbea749887228d0056bc16bc48aac6061c0d129a0928e71bfd01d2618f9484950197d8603cfb5fff3652eca53d5dcaeed9d7bbbbe7c87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "dabbd994076fffa9e4b265724dd43123e58dbed9f2bf6875e3cee296361be6e90d293e03d7a7dc36a0c7b5e06358970d0d2da9ce59445e6dd8cba853cc7d6625";
+ sha512 = "04ed397b017446b58ebabe5fe93dc9eedcebde75076cbe3c379383495124338567715190d781646338ddffadf00799f82cff8db2d211e17387a6eadfcfea7f32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "daad08e31d848a8944e36de81e01bc2d25614033ff89dfc7e9a4124e2c7c9193752c4be08240778c05a317c27e2c7b924f45c91b20de46e54ce28d030b4aeb96";
+ sha512 = "6d99ce21e7bb661490d4fe9b4bce4efc4af4021878935c4b7459e03984cda148c60ae74ec8bd9e509997b4ce85941a99cd99f11112eec5c6957efd4fb50e5ed1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "e7f674c1588c1674f28e7f76f8a413f20b8f50a290297f045f24db0a0911e65f7069ca53a985aeabe86fb69ee8ff26e8897eaca6a36de47adb42ebcc36a8a4f1";
+ sha512 = "4898d1c4d84c7e04c54ba5417eca8e15053ec6e8fcde8239d4bc1e720a0b1a4ff2e6cc72e2036e44d1e4309110ebf9415650d6218944ad3cda8b02829c173519";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "236f84d6ad9588d3ef8accbde3361cf89bc27e72d16bd5702925f929a7da46108671e2ec15a4daac553868433e3758d280dac5bd6e4c60676f55a22575114a01";
+ sha512 = "71b93f0a720444220a10c57219957f465d85be5f9dfccba5b7f00a33f2068ad40e5176dcb46b54f77bf3b20db3b013814f0c030730d5f3c35626c8d83d455bbf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "a8865c86b1a86fe1c60ddd42ec848b1be92f686571777fbf7b874902cc07458bf5e0e5739e6afbe399b499baa38e92414653d469e9d64b26dab15fcab89ae2fb";
+ sha512 = "fe603ff5cf3c7a5d666b85ec1610c6485194c5a79d4bb17cc79bebbf1d9c9642b0d677431b32d9514db261e08228b0d81c01ecc4dcbc6fb652f243c8ff7625cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "0a55d784b892c4d7704da36e8d4d173d96b594fb452e61c7b090b4d1634d4f32be21490501bad131b98bcb3648d36a08f1e6a944e6ea20f606136b4bd8b063b1";
+ sha512 = "6f1504c49cf285b4897935a506b0db89c0339cc0f422abf514b7c16eba4c26a606726603437b5eadcff18a7e4678882206376055fad295dca22daf6c0453965b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "74a645a86ad9af1a9dcb9fd8c98970deb1f5cb435e3a648f420e66d85235a7348f392f34c0f1a6467965c877b1a12e0bf67dab6e979bb1df82057d059fdeff21";
+ sha512 = "009df3d9e38256939448299175ef805f34c81d1a4c21cf5c0a8b7652487fa5fd0c8b58cfb5810eebfaceca6cb9dfb2eef5dc74c828d109834d194e7bd8993379";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "b4f6ec7eb9fbf8da6e1f9bd99c54c84557c29596fab6f9f75211d72632ce644cf2a103c02a4ee67196e161a2ec9127c569ed0fd47bf7d037c01c301c91bc14e9";
+ sha512 = "2fb92d1e50edf38c2f75d3b799c29b198ff04016b2d1118db8a32aca95e4f96d8445f6b8e0de745c225d6e6cbc724b1e11da000a7e37c71a6a8f79e38d2460f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "8c8e175aa2f2ae57f525d4b1391eb919b847598019b1e1f2dbe27da40512293075bd87574df5490fbbbd13bcaf5bda5017d980d815475a82b3c0df4dbcc28301";
+ sha512 = "dafaaf7b86b5e851b25fdc350f2fe2841782f79161a4a53f347df8daf70977a4a61768c749df90ee11d2d140e00ce347b9c5e16ad007538ee2709dfd67bb5263";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "9ab9458e038d48871f6c978e50ba419dd94be472f06aa42fd781b8a75a28be20d365c7828aaa674bd818b32198dfd5a075f2481caa5a7e201e7e94a10e7d2763";
+ sha512 = "ab86f804a8115c01163b04e70ec284a97250982d868515c574e20133897077b2f8d9f0c5302f0da7907d4fa9db923519a1331581ff0dae9455c4a0d6c3ff4a6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "0f0ba70673b6aa030d4fe415097822c3259ff7e76a0a4163fada661886a7a422ade8defb6d47ff8c49833892ea0ed224af2c2d0a95ba6bb3a25a89a990b39ce7";
+ sha512 = "d67a83b733c62d9666d2ef75088ea8cba79a4be1de9dd05fe2a846aa832970c0cae4695563ba79d221741edd9a8cf50ada41b5435c41545a41c712190ab910e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "ef5065a080d382ed3046e0f2c3f5dc09ae88fbb295d457ac659eb506f5ee171a0f6554ea83e486e98f41e3e4fab0a2e47247e9d72d67636ace34844262446330";
+ sha512 = "e5d7fbdd9934e958c9a3f5c2a19e8fff875ce5267520511ff806522976fe5fd727a58bebfaae3bdba0acbd365f65eecc55b7a23898b7b5e8217a92eddf30d160";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "ff46ec69b6778e9f17e0829d007e11d8e9f33dc83469beaaf0c7d99b4157d612f4c749ba0b4080c1f6384b0b0e56d2ee10df6a6e9e220935009a3c09a65ec570";
+ sha512 = "b34640443cc069a0d37038a93d8badfca4107a6261e39829430be3c8e52fdfd34f2e9d3229432aa51a120dcfbf3c184bc439f88e58002a6cf10acfb49dcfeb06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "f1df613339e61bacd632f986511f0b933857e7a24207aebcdb068d2290f52f1224907347263fb2aa121d14894a0f49bcb3b87e8737338c95a701dac5a4c858a2";
+ sha512 = "b53fe7353a363283b043d4c55be0c9ad61d8ff988d931ab366219fc7b375ac23bd7acd13395f127246f54c1eea208d8588d0d4b8d3cdf653cba1415ea96297a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "94c378806ac9b3c80801f344323efa0a3680f9f7319193d176032b36f36a879c9528fcb010168ac8e7b2f2c72a78e7f30eb9f0d88c2db4d9d4e57b99219e48d8";
+ sha512 = "33c8a35c0f1b61a3079df8d0fea33b2d294bf43348eb00c085aa79e0ba65e24ac0e6ae615fc07de75f77dfd3dbb83f66e11f343026c114f9e82d19c68883d89e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "cc69f5fda4840fb6e23bca315eac82614e0987aedbd54c01cd685cb09a9737eabf75b2074457cfa44880283701b0f178c903922be948ee94638b88c1102ad11d";
+ sha512 = "be47c88150653b5f28d4c5f5a5d8c9eb76f768e860376b31323b789d7a6d20a34f375bebb5561174f06ba56c5697dd23e204cc5f93a50a3249de5a08a24c718d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "20d3d3a2fa0ac8a8226e242076a431072324fd9cbab2a0e15901d6f2bee3532878e8453a2460e6ce1b0d211ce409c9659098a2b02c303ca171a1857fb8469395";
+ sha512 = "7e26b2625447956ef54aad34f0708d537e0c8d42e1875e4a01547b3ff1cb646effeb5090421204a7eca0b228ba04ee41cca43888b8a9df8f8461066c7266ecaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "1ab989e25b9bd016b65b45c3361f7bb3cbabfd3246ae9395101b1316a77123a09d07c780355279f79219dfd42e3b053f88ef3a33596eea07e6eec0ea3306a886";
+ sha512 = "9dc85b4151744f1e086274cd0fbd41fa7425365c3df2659f5ccc3e18ae0a6c70c2680a0e52a56ffc6d7e7b129ed3e83e0df47a6282cf043bbb75cdc07d823068";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "a8cbc0b97e8c5ddba7ea34cdd2d23b4251fff3196b8709c22a0f4627709d63827db36119d707b5e1b985a5efe3ca157365e29e090fab971b5b399f5c65cb1059";
+ sha512 = "d2758645fbb9f5029465c90e86453956f2069f19050a14695ee46a0686ccb0ed2e1cf935c0f009a14ece4f9f78aeed9dd73ace4997afa6702182c23fb746ebb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "f1a81822c8e4b2881bbe149e709450084be843d71f4397584e1c4c1c665752a1e5f1928e4e7c1562b6c9a7a4a2f394376753c61d8ed71c65e2d9acbbe3817f4d";
+ sha512 = "5c60753d92d0748f47a7b1a88f863735912bbc9a25a424cf79d756ccb31c0172bcaedee99d59dc5fa40d6575b8225c623722ff3c7409e685cfe04e4f88846c9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "e8e4743ec730f999a5944a0ce33244a38d4721a9993fa37bbd2544e7d1599c4005e79bbeeee4f3cbed5385c5fcc40db14db7b07d0e68816b85b0a5d7e64feedb";
+ sha512 = "c4863cf712f4ed5753365f272cc37c92bade71b5bdbbd5de50c1ed68a56c8ba908034f506c571e76ff70b3b32ffa64624104f96e2555c5401baf5ed8b2a58719";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "c32ca1a2394dcb6d022319f204101803292cad9bd8210bef6c55210c4b52fd7bda257172e751554a652b6c904d53675f0927c0e10a05d0ed13eb2e1bf41d66eb";
+ sha512 = "c4a28cfa188d07fac8ef2d0573f7c205a51578e520196b7625ef80e67c33570b3d545bcd7926d5f5edf10944cd33fa3a0cd64362002b7772f2a1e63b7ed0a5cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "79c2414ffd2b386bdc232adde3f79de6b3163833b91b42e6a2cb5698536378ced2fb2c87d74af7b5bb00767076a66e8cd7b994dd014a0aade07d4a635a038692";
+ sha512 = "9a3f4142dd48c6fbc7bf7e8e3a617e3cf7d48cf7d72dcf1661af4c91934a8b8a1de3b0306405ed6cd3d4f479d51c960faf8725a7bd345a6573e2d8338ac1a8c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "0c5ae8842de2fdbec65204d409cb64e96264865b06931c0d83e3d7ea17892b68ae19344807510a660db0f7508c4a12cc846156cf07c19ff99579fdfbdbbc3789";
+ sha512 = "fac26f3a82c6f246d9de452d789ae51ced2d94aaecd130a43daedabe2c599c8a083753955eed7855d2215eff2a131ad89e0ef9e9c089900bd2ad39ca3c93ac1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "5d4dea8c824a27f9a1c4611f4d147d3ad6dcf58ff855239609dcd3b0f5b63dbec68127b6d9004b956db9992768ae9f18c4162ffea37c430342de010de3f9720e";
+ sha512 = "806f287f3f833560bde872e5e2dc6d1efa3d2c58086c514f20700bd71a0d1c374b621906f16404de4c0cb9e25f35b7c499f432f605c9bf27a3b932e4f71f2eab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "69dadd70e72b441ca0d769de082e5d8bdb30728c0ec94fd173e9cdd18207a06cb819a3e0fc5a473878debc223d7c61a6cea4b9fb05c1e430d9c3335e7643ef18";
+ sha512 = "30df070ac612ea6f20cc6a0ea377e6ba7285400fc4b6929ae6ea053eecdb536ed2ecd40c0b7ec734499704509eb4428505e9ac3652d6f1721c268b2c82b693ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "4192cc3e34c83e4af33851de30ec113af55fdd3c68e7808a14e506861ccfca63909eb550c263a6b5297d37518ad82741e9ff36d155d27e0eb2189e7215c22492";
+ sha512 = "21c8502322dd6b4deea09bef88d24463d72cc039d1e52fe80994f117839e6a6c789c75b98f5b1fe72822aabd00e0d722c27b58214d527a207e6a37c6a8fbef52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "11bab8f2f33f277e5720dbf298a22c6f175645c3f4f8452e62eff8614fdb0959a25f5069db208521f2878cd3222744c81c6aa33dda0da883bd4b938b9a3fda78";
+ sha512 = "d98695178522e2b33117405d98a4c2a9bf3dfeeb51cf57f86cf44e95329a31c51e79b409514f8fda2c0ca1bb45f3b3761b857f656e737633d84b9d967e0b8d94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "3ef85a1a63026f878cf75ad2d48f1008495cc24d52a884eaacabdb13039c5f212c9b0c2fd28c8dc5bd48102bdadd98aec7c975e53f8abc028747c6c90dafeeee";
+ sha512 = "c828786fb800dfc9ea0eb1ca45c051a193f0581da8e5b4ea99f8f1108c022b58dfeae8aff1f6defd3ad5eb9e3268c3a5a4322b928d6186006fc6f0856a20d69a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "b91108f3e30085becf9bac0e743d5e84129f8713f31a3fddefdb05433b269b16b05db3d4751928010f135ca975d4979e6ae0c8a2ab465be09908987ad79fff63";
+ sha512 = "ac59dcd1cd8ce4f4586325a41c646f81189a3b57c96c2171cecbbb8828de36a8c8afcd3de2ac20f174ff5fccb806e8026574726b71b1405abd42c5639936f09f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "dfe613dc9a749805202c762de75de6d16571e37a9f74594bd3011c8c62388cae10b4556031094e8e3dfe7cc6773cdaa03532e99da80499b24ffb4d98a3bc6ee0";
+ sha512 = "ddc92703adc687aefc2517911a8a86dd68cc14f05095ec7335c127fb3a2b2d9ef4ae9e043730b797e802e2a4ec840376578b68c5f37af367a78d59304f434e88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "cbc5dd229cc5f33350625fbf6667354a21c8ac63b2afb0c256b7c507a2ecd9a089e577e28280f34a91416d1dad3aa5b2b787b104e26703e8db947e9c05e7e6c0";
+ sha512 = "0c9b9d5defc6ad1641a155ff9ac5ca632ca2c3ef8b63f5fa34ba9315eab827b806c42d51f0349827a20c02d554ff6dbd615293ff4eb3a990ee75813cca2caf14";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "827b51031897e41a796f212c9377d8119b9d1d0da9b7974170ada0d7ee27111bd55223797dcbbe272ef576780c6b80e8b8057d4bb461f1679f487a24baf3ba54";
+ sha512 = "e8136709280a870f2417400696683171cff81df1d67861aa0c7d5cf454415e84939e73ccf056f7154a786e1ce8cc45e9d996f2bc082e80113fb9168c1b2246df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "6ad998087dac027dc02b0157fe11b4b7ce9d2f2f3c923853cd1181557417e91e43e499b83730a5201060b31e30c996fdbd8a3b7c29b263f68c377c34662e8783";
+ sha512 = "52c4cdc1eeaf28bd7f6e77d88c18aaa4797f3e6764378d4d4fd91655609f868ca6c01a535cb4103a7cf1e00b785d46eca279f3ad41247c2aec40b912b5684781";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "8da84ebe54eba9df2b4754bbae8911570f0dff51d41e07b331ff4c0cb6929ec7835c166f0d0dbad1987ee0692d88dd41d3fc86b749b5b5144b52b2530b822379";
+ sha512 = "0f898ed4c94cb7c1e52704a6c5c4afbc3c8c8699213120125da8bc191936eee7582bb8362bc257fa6738c18f1dca0acdbb6c8a098c8f0d2001afb820c133797c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "6ddf92d42e02778060e3ad6c9faf08187ddd0926fc85f8904f10b5d20bc57a243b61db0ae42c57d264c345d1b5bee51c7e6e62e207c8bd8edc170d84d673e87b";
+ sha512 = "c92975d160b4c8baa3537e4b19f4369bd8bf4376824f33b4495fbc6f1b226b99419f9c1c389e43b72dd82176ea994c13b764f45e0b9ab848ce347f10f897f39f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "aa7ea0983b12ecff3ba235615ff2df5323fa979b02486506af9de83cb4eee679c90751ad43ba60d71ef8d30c39882e69793f266e79d45070157b097d7d12db1a";
+ sha512 = "96bae56aca7aa199b18eb85fdb9ba0fc9ebd67b673b23df8e2a44a2c59671d90b53a6d54a66a504ab0f85cf94cecf981d7dc4b6aab12ac480b50edeba9e5c287";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "e28af3020417ef5d42b1f48b18310fb78c6ea33332ad2714c69d8979b4269327b76e1c7e9c55534800d8a3c4937bddf95273097ddcd4270e67bb23366b641584";
+ sha512 = "74bde3c282ffd1d3c72b8515b2b30fd8646d384127df7dfa5b3130f4521731b201e297a03e328418b11d697243c59e9e53ab184c546b1afd7479ed21fd3e723a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "efae38a659b0d15fe1b1af9fb4d860df2796705df3c11aa51369c6844fcf24aaa342ff5a897b5d2f3be36a929f3fa748646e99db6bff70876e43387f45769b14";
+ sha512 = "4b28d362b63176ee1b848e3d7c46405bba1aa6c1eb1c92097bc5c88b1d1c9cdef21d288a79eeb4141d6b25146509995dc5dd439f851af3a0048b80526422c66f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "1b382086b6e2acab4298ebd6f80cc2585878c30f48a264e9501dfe4bb503818ed84d87e4e520f646a727ebe6180ca3a639267297ee4b463d5661cc61294f91e2";
+ sha512 = "a372bc9f43aa1aebba674f561ac2f1c4cf7037ce14ae0d3d607e762589a473169d2e3c9b134c4b9152022d29c01a100ccc019d78417ce39d971070f582debbad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "6eff37c77266ac61e9fd28bfdc7a674bd9ca26e30c1cc4697e0e48946e788b632291891fabe11d602727db931af1fdb56467f20c362aab555afd6ca9cb9eb690";
+ sha512 = "8be0dce6982e28bcf095dbeeaaaa45e248fb8a3f9fce583893aa93e454a62f88a1b86afa74aa4619c2294eeeffef6525fd9d534dca7f9d42f48b601b29f229c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "bac168bc68b214100078b88d66c2c88de66e23f0e456bbddeaa371a5a64a44c831281f4443edcbba49af34c6a1a5677e43d8a5c56d69ebe63614d8b3badd9799";
+ sha512 = "3eac71492680bb6f1ded25df753052eabd7829f18b1e1174011211e20a9886c6f8dce71e546a8c1b728469c97f602a0545d900ebb309207f6eea1da1dc53f765";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "2a0c42e62eaf8e23ea423fbd9f8995fd4c42c8c65141a537c51c8157861a8d9ad38912ca864824d52f961e752695739610bc626862153b091b9bbb1e83086265";
+ sha512 = "4f87f0e20af18718d2e9eb28e3a619bf8954ae76f88109f3a55e8b45effeea53e697aa236c5f5d987a34abf8b4ef3ba63ccf6cd04a3757ce52e225892ebaaecb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "5839b61e1bb4a74340d3068c13111ada01f38d60fedd9e64e78770ac92340f025f1cc92e562686a12b65fe1f17ba170ed925ea2e53cd4b70e0d2f5a1253623da";
+ sha512 = "eb274af0f67456af13ac7ad51c7b927488e4c2e79d4227520d3077b5a07e2590e49e0266f91930b0fa17011506fbbd4af8ca5d4f264d6d2a4ec480d2d5dd3883";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "2787536b263be9b7e0fa9f9bd91286b544d83468bc7cbab64ebb6c3c4e3d8ac7018e7ffa877c8a6b35718cffe190dd9ca96c3e3855029eec636dccf25636d3b9";
+ sha512 = "150e3506c32d076791495d5eea723321ceed71b0bbaccbb69521dd7357602e1c07abe6573d969fcaf22b2513b12d8382347e31d3ed0830f301c53fab442ae217";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "835bc4e3710394916c23ad066969364cb3ede5bd671ec2d96cbeaa448158f0048d4a33d54a98add87a0471253932f1dfa2cae05094d04bcd859846e6027903d5";
+ sha512 = "0c49ee53876fd170bafe3ed9b301abbaaf09e8848e7eae3be7b46a009773aab80ac559d66211dea09e9c74fb988d64124b51838b44d594cac8a9d50938c9bbeb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "ec44a791fd197df0f878e69592aa00eb8425515e072628ae857ac15101d08620023dba0f30eeda14baa8c6bfacf343c22e3e8c344576b413e32cca218d6e1001";
+ sha512 = "3902c30bbdc02c2a9c6ddb60e5dfaae52c74f8218cbfe3410b929f1ee9ddc5309888a8a8bb2aee172c4101eb4b700f395df00a98cc1a1d32c0efc1f73a0a1f66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "6913e130cbc2e982a39e88656e15793e2583ef4686132588e5b1b101af1e4aab53124732b64b46eac2d2df43376b2a65fac961c6120d05158a44e3217c315805";
+ sha512 = "42af1d5ab70d574eb6b9ebd175e9fec08474a82e300cf2a01ab14b5e07d1491241b973f749992fcf01a1d7c7718da0c0bb4cdb0728c937f2a0a73ed70202e8ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "8469bbbe04052d1fc120a2748997376f397359bafdad36690bd7c498c401c4934b278e1d1e57d39c1869fbd4f3a195247aa6a339f49e8b17f9399c21253901b1";
+ sha512 = "801a919a8d1ff558df160caba43606d96ebfcf32f7af1d5a2b5d456565d1b0b31495795d0e7ad3c048cbfbf6f6a4ab76b6546cf4c8912e05851374ea48c0fd14";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "048dec7d7c0e2959176ac19f215cf585b12168d7a83f117a35fdc82afe8d001b7df7f84da628976d1e43dae2e6f28fed06701bd1c9a44b0fffe9c2d893f64d52";
+ sha512 = "9a241eb75506db710d7a4869fb110a33063a8f37e583812b34ba51368e3b59e68602c017e364331eccb5366b652e204af4b98e1b3bd4f66ef60004e64cce1549";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "63bcefa4ef757bde099b7661e21d241b2ee88a9b8632567b8f2e8150f70ccbe21b89c4fb6d59a7488ebb372130bc93406408b33ff8bbb54c555538cd77744c9c";
+ sha512 = "014afc1ad2111451a775864be7ebad47efa48241cf9709689ba5ed275bb7099b173c421bf606031fac4d9a350f0d868f5d0d27c9ef964bb1bbaf3867f69c2e05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "ce360ddefbaa522c5f4bfecb7e5deb61c342b0adc59a69d1fffd953dde013ab999430b9f0dbfb7ceae94e9684896d83c9222bd3460a5eb7afba9eba26447dc0a";
+ sha512 = "7eca51ff64032688e11e7917ff6d672bd220f961b891354d0fd13c9a88872a183e8558beab2ffcc98f8ff58ef5a38474abf3846b7b8239cda93816933faf541a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "eb0c148b071a7d654ffabf62ecb1236f9294421bff913648c95fb729547f6388be2f8f0c8f771e5dbec2c446dc4b6c1db962a5abb46019c2cc0f8eb8a775b402";
+ sha512 = "66ae7cc41c2c9a8d0386a702c6954ab7dd31ff5d7cc77416a62e0d9d48d658586c63125241f8d92aea9e0975ab7f5e12cfd6caafe732aef781de3abd3efd1f4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "a0023efdb0ff31515f51b4150ee35ae834d6f0ae976d0209ee23c93dfcd70db58c5c94ebb8f8e319690701d2364ab5fd5db03ed7a151fd33875787c0478e5eb9";
+ sha512 = "93c1662dcac61e23f8773a03d6f5e6918ead687d40a8aba509657284e543205e6971f88333a093e18549c95fedea0468b3f1bd8fcea80104f778b23eae0a1910";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "b850af8723d3d32fde0b938fb4f7a8734cbddbbae34881deef09bd537d27275d553c107bde3aa97c3123324f8bd0f63e7dadacb9f85b38859bd30a5085bb1511";
+ sha512 = "5ce6575434ba4b54278c1363cca97f9dfa82382604d462e554a0139a108cf2b685436ac140f79253fc4f8c9947e662a077edab7de681060c4374b4994d26cdc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "57bf9bf93df74d3b8549aa706604d9c49c3157ebe9f23fc4fc0a221f9c00d2e60570055135fe4534ad5f364529e6918110997d5ff2872bd7e8a78021a0df32da";
+ sha512 = "6c61ea82705d13b8c8aafdbf5c14c8eba79dc73425678a6b8f87c9f6f1868a7d38107d4cdd54f94c8131e395e591c0a2f6eceff9a66c938c4929fc6524428a63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "067ce92c82925b7b5e9bb74aa98d59b4d7828e47780790634941f6e08334822bbd0751d783d7ae4a0ab1058f33676ef94fe15db7626e4b0aff6c514e972689a8";
+ sha512 = "338f7bb15004c4f820aeb0cacf8cd3cf7155f787c2546f9d95203035603d001b4c85a60f61415926f0b9a5342bfd41db9b9b865cde343130165ee1ab36d7dc5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "cc6b9af7acf4d5d075cd53f1bbcf433a379fcaa3326f483a88ba7c44022aab53d4c53a2620b94189b2034c5009d2cc93c1fce2e0143c0d3ca0469bc00edbe8a1";
+ sha512 = "e9b9924c45ca63b749c13a7aba4786c9f5eb75f0a2dabdc040fabdbde53bdef75fa5d93cc10130473e2d11c884ec7b5a643de9cf38ca1860e2769ef8af1eef05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "20d87043704c605855962db40da5b66514a0920b396f815e4ea091769c6564e9226f6ea016415f1f99ec914450a9b364741c32bdc84a12976902451e41b16463";
+ sha512 = "a19374823fdc429971d35c2fb3828304d0dd46a15dd87d866c524526fe6f17a0bea65ebfa87f0c90eb2d9cca3e0acf1d54ad2fc99dca3a48c112b7a19708c167";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "d868cf388f5748e282eb6f276d318babf7e44ce8540fe6a13aedc04a7cee8adc85597e5b95f72780fbcf17ef54cd3b3127742e18ded91f0d6b08a4b9491c3d19";
+ sha512 = "e8f73af598dd5ece70c1576d4a8ebde107f2eb00f4d24800698fa2f4ad81c2cfc2db07874cd412482369ad50029837f43e9a91f9c39a75a1214a7068227770cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "1d874e55ca2994701c7a52807ec518e46cfbf16626b174e0f3e6cbe8827a885e3517ff709db5fc66c98c3859384d87cf839f7e72655a0d8d769f4db9cc39e666";
+ sha512 = "bd145ee016bfaaf90679c0e2fda92746b05f106055c0792b3f2ecbc00177815e5f13285db7c2ca218d9d5e396c6626d46f30f5c3356ab345fc5c2819d1c11b73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "91d5d2a53d8d85e59e9ad4ca9dc0eaa931091f6f267506aad095c77b71be59826cba00de1814d2e78eb95c869ff0c8bda02676aef290b4a8332df0d066fe94a6";
+ sha512 = "7e64a10c565f9f29385cebfd6cd182cfde4ed4d6c7c13794ed2c43468f9d0de640035769184f69e7e3da864955188d825c3bdeb2ceacb7b7dc75b25288edff71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "3abfce359bfe5cd385417d2fc30a4af9bd705602b3d902d51030a12ca6ee9086ee7b741a07def056a0e37c767a5e38f293f0d52a48c8f6f60458e74ee73cd300";
+ sha512 = "23bac5ad0c847580e48c2dda4beb71597d7601ce9e4931084dd7bd5f68ede83ac0e80876733e4178a4a53a6cdc2bb7782e9324c6efcdef76ab80cc50327696f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "d79566a5c6889421e66f189c86dab9e32c377270b2fd70e1e128810dd391c651cd66283045c8b0888520f7f42f4d98f03274fc06dda0a1dde23c3e3f50ad91e8";
+ sha512 = "1984c8e75011137af33f914327581c81454cb8e251895d6dae8682b191490e2c663e5f397e80bf046f430ad62222ea7b0bd9eb971a222b465cf35fa17274eb07";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "6bb45e54027839ceb0f8ece8a5a3d49ced35bd4f391385a69f5c26f191e87e9f06f9f59c2471ec156aa38a23cae38dc3996967946d12e88bd98743e15d888edd";
+ sha512 = "ec3b21771ae42ed00fd0d514d12ecada5d777e561db150ee72264f0e4e6a4a0c4730f1103efb93782575c5221d4de36e6a00c467ad5f5efe8538059d90950665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "3707d12351e2c7f1d4c793593ae2773625c4342d53a5bb32fd1a1f52d85c504eb662beb995894a5b2eca67753d1db1988a247317cb60252b95dc1262618582e9";
+ sha512 = "03fbfd04e90ed448fc7660f74ff525ddf8a70f1c575fcab9d5a17c84fbd709d14a7ad6c255b70a4988a4357e9139f29ee6cb9cc0fd4f2e4d08d7acf60d850018";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d18c2cde2cf0964d8a52a68a3f4e2c9ee8c6239ea7c642ec2ef12bf2024dbc15c125a9ce2c49223c826114714c22a27bb831b3f5dcef0680646212cdae6849f9";
+ sha512 = "cc1d86f175a7faf7643d46ac348b23ca7f83027c2ba6f7b8355333914fe60f324f0b458b69df1f950aee3bde31c6f2acbf5d72461be2502d4011494906b02517";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "2085451b2deee6741ea6e724ffcfd373118dc309018e66efec6364eda48b05d06836819d86a23d623ed584de547e9c55bdc11ce5a2c4e1d44d64c442d3bef929";
+ sha512 = "2e3fddf652a879f2c379fd59e31070cd5845555fcec8742df886383bf669d9d0656c535332aee097f64a8fac30a9421ece567f91327aa494dea4fbb34df62631";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "2736a45bb91407cf262973337afbf8d2612890b82dba65f1d9c83007550809464a60d3b74bc33cde23a23afba0e2cad905ee96123dbe791d14cb4ada7f87e1de";
+ sha512 = "38918ec4067e0ac6511b57c787765aaaa31b5e26a9f1d406c2eb6f6f7ea67aba79780bef67fdcc995659703d17509d95aef7c4d86795fd1aa6e18833e7f3345a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "7ba928225062999981206972559f6c52f9367d714d38ea0d7fa086e2f1d9d990b336ebfd0b7d1b08fc06cbb386f89dc5c95d8e136a393c7568a0b9198c0fa6df";
+ sha512 = "dd4cfce4d9454ef2f679970ff9146978c99672f8afddd81e5f854225c1347dc28180f850b30bb4bfb6425e333bc29a42efa7213f6aeec2da306e259e416cd33c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "92c33e5139b130fd9e3e83614443ccc2a189b19cb61949a381e259dcaf0dabd66b3b127446abd1117079cbf4c584c1de0398dacb1612285db56f5a4f0072cc90";
+ sha512 = "d7de9b468c03310cd5083ce097b2f45b9d5aff2dbc8938f6c549eb86ecbdfac585cd4c52ca45b83809be1a6113a8dca2b7875a4f3639c63b748680629f8ca45d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "bc34bde0506218c0e4251b22b1849d05b9d49ccbdaa8df650f56ebf87f04172b8adbf2204709f182b286212bdce08ef9448e8818dd2622bccc3cd9496c48e111";
+ sha512 = "d7290566ee3014debda6df43688df7d5fbab4d9988901cdea0be89c83abc2f2967742e8641992262794372f2da6bd4c67dbcfb147fe55a4ce27a481b36de403e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "8fdf9e385f94357aa7a08147585d02e7d293d7c6155afff3da92ee37475afee222439f4d93198bd24c02d7f8109bd6842426c65725f19aedec9b38c8aa088627";
+ sha512 = "38978da54270aed6230529cd054846479d4e6bad90edeefb93632702660a6dcdf486a1ab530f803d1421a32244a97d8df093a9f216caf98698ece7b78bf15cea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "f95d32c4dd652b35102cea1f9791713a4dbf40cf985c33268ed35f3e5abec87a46d304cebb961f8a80d97e4e26ee907266502f9e6d1f72741a018a29e48544f8";
+ sha512 = "dbbbcf8704be715d04780a0c8c75c0efdcd587d5c2554e1bafbd45c6a9775d2884fbe9df3c8d3c2a70cb8fffa1a20459b3df10710ac203b0456f3ada3a1b04b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "b4909593c8c99530b791dd40381e891f4ee61c0473a0fcf44e0c5e5ed76e4424930747ac7f479b21d977e245b0b53b2e692a43931a5d72ad16b65f37f8726967";
+ sha512 = "95e0cc1ec760dd5cdc6a0cb0d5fa796d109e1a449585b52b1bab153ff8a6177b3c87bd1408dad15b6e193beceac6b7ee05366c48cae63eb73d361616434a45d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "43f40720b91f6de7323fcf866b032ebbfa34640ae9786198f87f0e662c1e33d7910812e3c4bf45fcf929d9e2d669f7ec4d8f10cfe47d1fc82c5654b4bf2b40b4";
+ sha512 = "3e7aa8df3f4d03a941e275ec317f8a60620f4b5d2e85800800f1b9449cd4ef268654f036e1a5fa4e9200e876877b25d39028268e0a2eaa41af79b9625584fa11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "a9905e192147a4bde8b97f26a63f08d982fbb05fce96482084ffad7ef8aa54355cb79859ec8e095ce49497e2c24ada38fadbd77e0e31ac70a5fb6632bc7d31de";
+ sha512 = "5ae01651524bf28fdf9fb8117aad4a1eafcd20ab39f16428052f09db09e7023b7558145cb866bde022daf61d021963b043d972cf031c648ccd88bec19176561b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "d1275cac1c2c1e98df38d745b6d1673b341198d87db6bd767ea8e2fb4f525df874b3dcf9c000e4ebe196bbd2a0707af6ac3fbf28f4b21dedab78cdb89d6342da";
+ sha512 = "59d2ecdfbcf4ef0c8c87e919585e989b4283917d002ccb6d4b31044e45c0fa54a508b4ca99baec1daf74dea5c068d2784014b51f10588b84024a41855ab24fb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "d40af9cc9212d83a260d42e1c4e9dc1102253cea3090f8aa232ffcf97b5fe417252b1360f126c97c44d9f333187b896883cc3a8de77ced1020805d7bcf1980db";
+ sha512 = "d328908f23da7d14588fa3b95c5aad10fa897031b115df309d9f441ff9d560c39c4bfbca7772d7e65b8167bc41aeee0df5e930918a17b089427017a5f1cd7ea6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "2e2dd4c1f5c2f53f3df2510f88a1e73f320025871b3b1e4e08f3553c51a1f41b8974f17754d705c2939d84442af4b4e6e0f2f09b35674bad0fe14dd57415d191";
+ sha512 = "72f63d66e3215bdb224f21671f4ce6dd14742a5e84be35e889e30251cdc13d05a9aa2c4a8081eb4a7bcc231e6a62e5228d17e261d33dab0897391c90aac2d4a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "6fa7e9d22e7c379325de750725b25e31ccf814bf391dc4f7ec30c226d64345c52d07542d05d4d096f1feb6d75da37fcb3028a5cefce7a4a7bcb72cdfe940cc1b";
+ sha512 = "6b7ae7e07540e3ca2a394043b95c75b34a87d15b1f584fa17ab63d81372ff49a4a490029cf3a393ec001864d6dd9263b09c953857f83680e65d133aa3d5c3d87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "0887354d8e3a990cb3a2a1267b6e6e60084aec7bea75f4839a41834023f327077f36164dae5317da47fd333223488b903c77258d73fc1077bf411e1eca860b67";
+ sha512 = "036e90d7673b745a68b94881da966f0f1b076eb9dc50cd17c0b47dd130467e27f68a7f1e5b15b960a1776c97e4d7ecd2424a96a5c5cc7ac7d6ebfb4ba6e09445";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "53ce519552bfaeba90c00e108a7af36bbffa8f6ca1f580abadbf441ee29a40bd93d31ac65ba3c875e04299646237ed4a51736653552d607436ae177d5682c84a";
+ sha512 = "28fd4cf0573d0038cc3721f65588a4ed397b5c76006e822d4e7d49f2ed4295f8ebef912bf47a8e511f394fc05514c9e14f39b17497a1c2d942592075b072b020";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "1c23a2e28c7c14da5f2c0fd30525ec38c1169e8433991123c8bc97145354c8d1ecbbf6df0430b89e981222011e27b0c5b723af093ce640c8881e0b9e5b231939";
+ sha512 = "452a7447c706dcaecb3149b4e7f93de8b01ea378e55d21975bf3d630102b5b67d39d8ab9aac4eb650e369599b95e5e10e028c0ad8120e5e2934c6fcb0f8e411c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "9439499f577858237dbc39c6cdc20a87276cda77d45e14ba5ea7f090cabe6813d7fdd8b77a32dee6a98fb880f421562a861e98aefa619fc44b0c4aab8b522b4e";
+ sha512 = "2c105a1537ada5586bb30daf464001093b631925c09b7023638b8426d5f65a1e39bcf67d15c1c0d03860b39a924a42bbfa0a5e7c102f1552d4e24e7046e24d7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "a04051d0bf181a02a04e2c36b8f05b38d7f3eb6188c5977ed965776120a692d8fbb1d3d2ceb38da8768d201f27c1b36995f68b002a9261fce8786d34aa2265e5";
+ sha512 = "382bfcad799aafe18d295a0753e8958b2820a38387925702aa948125d71ff0bed8c87893060726c4650c2b4b4888da6f4fa248c1ad93db6f601c5b888128c8d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "2230ee909e8cdcc10d40939eb6eaeb5c8289c697e2d0a5e4a25a9b1345fc6b49c9528e974212ca3a5aea3e54c8c8948ae56a2232bf0d207e82658ca2dfdd82c2";
+ sha512 = "5219f022880ab50e3ea6c80cb987486e08842c00a80cf3d4454328628264be4acf71673b0116a845ef1573a908001de4e8ca4d99e9f68407fbccce010eeea483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "26e7a24204190fb43a972038c1036e93e2fcfb68be804a8189b0006ef8a15094e152659206b1fa9b7f0cb5f9409aa4dd769fd675fbebbc90f323d28b0f3d58d4";
+ sha512 = "c0c1c23f182ecbabc8eea283a28ac563814be8cc3dd27d06bc852c2cac93594aa40574e3cd56227d626430d3593a555affd033d148501054bf60c7ced2c45a53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "9a86d804c199c530dd7d41d4ae0d72604f85061a594c5cbbe1de2daf4860c4e36831efe00ccdfb6b5440c88575a6d4bc2d786396f13999453729861ee723cc9b";
+ sha512 = "a53fdde333e885574e4998f64b3cff4c436c86683cfbb918e9d50d3b093c8278d7b509cfdbcb0db4bb1c515fc5aa90432ee0beaef4f3d6dc660f275ae218ce44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "181c0a83a5bd7d7fc2e80948704f2a466057518c5a748a54e43bbbc0fb8aab37bd7a1c83892af60ee359243633fb8317c42552121b4e0ee476c5bc7fe115c0d8";
+ sha512 = "91407fe8eba1299c6d0e9c2296b8f5cfd357a87064ba5507f1eb03665d7e6f98b5a23a2cde806863eaa0a23fa856b8e11010771d946e49dc5b38535881fd2029";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "6734e4572f50cc7cef74dcf63994ac5ac2d17cb0c2a2110a99cf0d5c38cb3075f72fa21561ed9ec98dd860c39262bf282c3a82083e436d1b160a3d15dfce3a51";
+ sha512 = "ae9ccc474b949d47b6c7f72f7b7ebafcc9501539af7515e9cc974b89bedf868e3adf86148863ea8cd6d363596adb9a7e696ff4ce8d94b25518d89720f2812edc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "85382c13dc0a828155142805b83543371487162821c1677e5411d8570dc8e1393479116a0e7bb62abcd6e0abe477f0671ba2c2c600bbf855ed32ed86f1aa744b";
+ sha512 = "2884ff249b65f92c98cf9776f218ba8d0b20129cf449af7e73db7612e98f74b147145a0aa47cded112c8ba45693e99d037d127fd6dc7de452bd1ac283be79d3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "a2c071e374c3dea2da8dfb4e1d7a001ee30bc33c3702d5e352427596dc03b36b734767fd3bd72fc4e3323f99ff88b475a1d7deaa8d14c47921986b4e3b6e9454";
+ sha512 = "9d3ac6f5db153d1b22e1731fe4c73cb0eb3a2a83451832f923041ce2a531996b92af866cbe098e46561b4b755758179b6984df90c21b94ec3ec194e321135672";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "3f92ae32d51baa4dcdc13322aef8653da33fa0bfb970c3a58e5cb4297d90f8162f2020902b3f3bc566b7e5a07a317c8eb51a7f9c737a27bf043e56cee258d523";
+ sha512 = "f190b04223a2ba85293239dcf375bb9cc2238b7f2ddab612502cfe6f3f040d33e83fa7f0d73b588c222d80b765cab28a8f8d4f52bf602e1421268e941a8f3c67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "eaec68e83af4a68e8dd1e7ac63097811c4c1a84fc577ec8c4ed9cdce72785fd2d99e4e534257f34a4ad53254e81a6c56711cca9f85cabf1fa8eddcd26ed0946d";
+ sha512 = "d91ba417ca86f04dbbfd1eb4ab953ec36d4d8ecfea8e55e514e5fedc4b08b1f634b1e426d61e5a0f92665113923358019f5b8babfe24b0a1796f36cab0ac532c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "b0264932f94862f6b4629f1c853e6207120234dc030a298f7d5dd975f9fdcc357cd9b8bf38f46221e090b1f63aa7092c3c5005b3f569a937e8d6ac69a941d4bd";
+ sha512 = "122be20f884eaf3d5074918adf69b26486189d458a6eb57c9d3e53757bf41e5142afefd7c18d6c6a9652f417fa6d649e2c02f7eaab3aecf2831c3c145518fee2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "a557244b523d64db01ff42209e48fc5ca21f603916339e61fbadbd74a59477b9adff021a0f47759d5104eded00a12f4b008644279c19cab7a45cfa9a9a3494d4";
+ sha512 = "fbc0870001eebcac762354d70c1645e2115b01f74792ba877b4206ea803ba33319d1625f210e19e89271291ff582e025ad732ba8e52d431e443ecec6be4f5527";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "11619898aa4163d6ee42e178e58b3d25ef8c9263312a1c62cb9e2c0b9516150ef9990a971594f8b1f1421231c4a03c3337d2aadc292150d384c085a1c012cb96";
+ sha512 = "c701506d4e54123e979ee202f56d55f4a7498e15b26e2240c3e95e56e30322c27fe46c52f4034220cde80f8454c4361341c7ef61a6be8041b7f917da367f6d93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "642ac490b5171afa96f3363919e6b5bf4e16ec65671b36fcc543f7e160bb0d595bf271606b25ebf1bcfdda5fc3b3ec5a088a766d52fc6b72b72a1bc5d107ebb9";
+ sha512 = "89cb078ea4355a43f16049a322b13dfb6ca0e8ca469af76dbea2099bb77b0ae861f587f8b6e8ae64d3b478d22157e164ab1b38a8a3cf318abc232d747571f993";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "bad1ba5729895d622c0a452af5a0b34b24fd332a386cf27d71505ce1e9a0cd164671b0ed6b4c4c7befb1aeaef75f3142f73ade1dd384580dc71a3eb382f221a2";
+ sha512 = "6f7bc8f489fcfa7405677a31819c3f37e75c663204e1e99cc09d5fbbc1e5eca95013985f6eaa2af5d749868b7d371e71e16b310c19457c02eafc830017c1172a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "d8b89350f75d4cd6f33e2eaae4c3098462ae319f4a7df6674239992bebfbc961b9e60a2cebec99488e1391fe68b218663822e8c1b773f63c6fccf36fd57fea46";
+ sha512 = "efdc85111d772d9440d0fc8e7a875ded44af7558c55e39e1c7feed7dec7d81947a0cd16f2b783dc53ed988acc5ee34f0649c7d73575e96ce1a86d904a1a601c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "835550054ecad1bd4aef10f18b805d9bf1726cf7ccbdeca04696c73a684777cc51defb1e9ff7fc67a1f37ee99a0b5adb553078cc7a83e95ad6d87ce338c9bef3";
+ sha512 = "624196eb8805d240194358eb5c3fbee121399edde5382305aefba0c09cd1c8a9828d24b738f2ca75cfda1e19efdb021e10e8fcf6fac580c6df236eb02f033c3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "cb6836604f5159d13f883678287c340ef01118980014ba9e72ad4c17d86e10349a5b44be1ad0c0ec14e789a1b24e47580236e0d298d816a2fec0c5c02ca0f19c";
+ sha512 = "6bdab654255347b3ac854654f61388ccb9a4ca33c7b284023cea92442ecce0bce5bfb0cd9b10fee55ee874514dc0a503a55ef5316bffb00367c7ac222ef0cf04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "119ae4627c1945b00acfbf03b43e97b1b94ba4d80ce71e277a6e23ef5953bf775e575236cb16ce4d4e298007f02fbb1676fc0526ae44564c87c8212769811587";
+ sha512 = "7a328b816bb746ed737680d99ccf5a6d1e961e6787b12eba6401b8a1b11735878839434a63a3e4bcc314ffa2722c7b42cba598f88f4b9a490a7fdd74ce1e81d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "aae23b11eea3a49054c0ce4e9e9ea9c1200d9414599a6e9e993912a3b64b5c94c2819f1f9f4b65d6ac8bdd2cfc0ff125047cdceae286324db33174c3d6e7bedd";
+ sha512 = "f2f4bda42831825281652422cd557b9d60781b0eb3056827a71a5d71636df8640f2e4a84297e711f4cb52e82a006f0db5d195f6005600a50c21efd7b82595868";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "aa88612f31e96a0babbd08ca4c43db75a869cfac1020176bcdf00125a7dddd0736935a453e277b6408a59d3b21636a3c60cd9e40bbe9098c2da31aae54d790bd";
+ sha512 = "3abb7347382ff3b8bf4b137696e14e1524cc4a97aa1e3547178459ef48505587c98be5301cf758db1cfaba23ddd6ed095ced6e53a0896cc899aff53e9799f128";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "25668686e42ca15bdd7dbe95380c95b907262ae72c3758fb0993e077326c183e1af79af4bc9d33b7e7d8dfb142d92618b1ead67a834d01e9cbb3fb346f139b8f";
+ sha512 = "1dd180859c257d0b53a48e024f9092480b821cf8a518665ab88407c3332b95699dc26ba8aad9370aa7bf9324b2ff31dd61ace472be6c753c9779410568612af4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "9beb520fc3da468a73d0df7fb8ea937f05107191167fff8ffff2242d4db6677d4ad1d4d248170ab55a6b31365b5bf965b17e0a52d4c3c748cb0fe62f7eec85e5";
+ sha512 = "075a16457c3da3b567554707f925b6705934538c6dba870d3a9557a8a729540ae4358ec21cf1e56b33f89d24c4e37315c926b48caeb99f74247f2598f5fc7ac7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "14f5bc56ea03912ce445cdbfea2840fac886bf048587db3230bb03e2f6999050e532b27011c1d83995e74885fc0cf870990773df564fa3232337a13b4951d1a8";
+ sha512 = "f27afaea7a1862620f6660446f6d633756bdfb309294532ed9a7c482f52a004e87a0aca5267174210dd34c10337b76162cf9febda409d09568ff8834a1df71ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "57816fefb3fb9024473723c1e53dd769356d08f7cee6fd18f3a618707d7c474b71ece7e0da9b61f9dfc8d870db046d29a6905330248cf4021e538cfd93684761";
+ sha512 = "67e16e18912fe5267a5a20490efd95e5cd3dddc3c2e6e408d274b545e091b8b40aae9dceb117bbb6ce76a7cec6325dd573f1a1fb4dfcf52032b3e7f6c5e59de0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "8ba70aab5a6407a5c4d4ee301b0f5d91c02cc446b1543abfc9ada2063a53d6c9335b6523c6a35abe45cea142cbce92c86f0100a036ffe69932b587cb16caefbb";
+ sha512 = "cf310a886f9195094ac5b0ad8b67efc8e56e2bdd0463f31d718a194a1b34551290e2fdc18670978309b38961f3be3ce68130b67ddea803e8463a2c9232863290";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "ce9cae447999f616bdedc37c45ab1bba851ba8f983a4b8b9b1670d080521172fbec753377c7577818144fe297c9a7f81b9ac3cff5f42a216b089d40b035a9cbf";
+ sha512 = "b02edafa763f97cfa299e0be00212c68862ba9877f62eeb175772b6ef66cfc97ebf2e0fec67e364ecbf577b560b5592b7e3a578dfa30e01e4e144a279ad7d7ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "0792d7a73fa37b69be10f65e99184c6bfb7de72c493a06d2a808583dc091f414c686b9274335b532d6e371024c069d20200d0454dbb4c4568e46cf6c0fba2bf4";
+ sha512 = "2a95d7f61f9a00a7f5118caeb30e0ff301604d144cb13e36dfc67eeb69e307477c51398d066413830fc4c3e9c0b2a504a2934d8acd1ce9ee1edf3ec5511efe61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "59fc959730efd2e78399984a3d0ed18d653e92bc2edf8a37b055ff715e66672d8f938b128fcb9f5a5c932ea8d265a509f1c16cbed7f054449a4f4f2fd51c42ab";
+ sha512 = "33bc459e16ab626ffaeea3b8c82982d5c72fa712b6e37053a3c75470fecd3886b314d67f6473f64c3e64842c02f4907dab1b88fc665bfc42c3b55f1bed93c8ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "575d9b2e082d5729f09587434965b383049375771029c188f0476e34bd21e10fdfa20d766cb934c567602f6f38d883c848c8110f6a42f9f62ad258c478ec0f5d";
+ sha512 = "64c7caa01480359e84e8fa2f45820afe4848186b09ccbdae837d535592c07e719136c39c62b34f14a3f9e280f1321de76d18423f2e7b8842029d36b723b1fbc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "712438e519188f19bb9786c72a795c030214dfe02995419934e58276a4b5b22413daf0ed0c21da4849c347c222f7d22b3bd9a95e9cf9aee6b5e94e7b950ce801";
+ sha512 = "71a3a7ef3b709d56e0e7113be2a56431b479bf33eea3ed82dbc6988eea34d9e7089e2e26a942f1a768776cdf5f887341abdb6d08da459de70635d7850c621cf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "8bf978cd1d226dfb74e9da959da105d6cf995c1028c1cd2bbcdf09c93ee300de6eb58eadfea690fb629ac93bd49f85cbf81b9bd49390af6c6e54048e0191b8be";
+ sha512 = "289314e3af8d59cbd06321e3d4ff2059809bdd3b8612d857b46ffbed9ef4130acfa6efa5c64fae362b81853502312cb2825fe7a68941d14fe80d586351e950fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "47c20810081469552659ae2d845c292db2dc447c1974dd768544f2444020127df85d3320d7cb25225b8dbedb4e3015009de9eb7b5aaa1e7a4298302f527db32b";
+ sha512 = "b1b6a68d8928535dc2108a8fc8d695f719c000800961525b7e95e26a0e17618c79595459fa3c841776bd004209272a928907b646ea09a004d2594d7786d39ec3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "4c4feff0c959291112f30b952232d50fa78e4d05e715fcd6c34e26d26ee7629545ae46791d04a8672aab3bdb19024295c94a6fbf2b8b818346107378016cb72b";
+ sha512 = "d9062cb3dcf8189359774ffabdb36244790a27e9bf17cffb7dfd35552c79c75a1e583aa054a77809e519befb4190475130a7dcc13f1fc996cce67775d204717e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "980910788cd4d38db52374cc399e90315b0829e741c211ce0d225289c8e763bd45df45b09ef4ee0228484a7a33c3ccc9d05015ede42eb427b2336ce09747649f";
+ sha512 = "fe22b18e8d7a2e795ebbda404980a920aff14f8262c2d8af61948ed032950b8e204fd817845b6a732a7d2cd98fb77871c4945d0dc9cd15048287b248fcb6daac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "cd2f42c3ac9daf3fa4ea83467926ba9b08f718847eb22847be933d561c485791f1befbe04600a87bf0c5bc9016864c46c85add776f5e6c0a1586437fb57a9532";
+ sha512 = "63840ea6a185ddc9764bd014e6566895639ec5cba587c77e8053b9da840be82a90deecf94661ca18bf651a20a9134f1a431b0a4d0f0cf3fa5390a8bb8ecaaacc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "6f1f8fc6aeb632a9b64b86c38ca38ed1baff443ca2594506e7b899c422a9bb38d02ede49bfbde255ef2ff6d0bec55d4f42d05693459b4391521a2bb5971ed6de";
+ sha512 = "916feac0fef268f00917160aae79384b171581135858ea223b95d589bfec75ca7db5480a4fae9badd97dd224f2e7d973094c755c759bbf9e94dc78826729b16c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "f44f549ac0119c680fcc345bcca64f5cfc6211184ba4cd02970268bcb26a9ba574fd402b4f6c0f979d0585ab53b63997adee54b3ad681637323abfeb13c5b0cf";
+ sha512 = "7db5b29729632bfafc1a7709965b3decc8675e5b8aed5a0d24bc60c857ef8f6a6040363a697c66bb1503e8f5cea3b3a86e039a2ac0818d4f4381a11db53730f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "b1b2b02937e7eb609dacc7fa5328028b91ada27ed0402354db6e9824afc6d0a51fbc54a65ef9e779ee202b6f900950393ec057c1486036a6976894f35d0a79ca";
+ sha512 = "67b4fabf8237910a12d9aa23579584abd9a521259933ff4e6888176cce2cffb723298e2e7bdf6d8697f527fa3af522b4bf26e7dcd105aeebee9d3e211639dca7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "04446201bddec281e7f47512490aeec2f408c73f6f075a0ca354c012266bb96f5b5bd1d226e75cae470229b4b2b3ab6aa2b2fe48040a10d576f6a4647dd0ba45";
+ sha512 = "2ab762d30b3552dbdc04826517d2d819e65b4e3b8f312c6167a267afa4b7724ce107e13eecf1e99faf42bf14a7a0986d8bffab3aedeca8b441f0c5141f3c283e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "09099db984cc27c86a0c86a0d45edaf6e4028cb5d946fac90022e65e18736e1d048137e3728338ddcd465075ae77a863e39648c08a173da366071168aa35bff8";
+ sha512 = "6342afca1160a2180bc40ffa85edca960634baae4aeb219b68cceaf73e509809ae0bacfc9902727da0805f26ade9e59a4a206a70109c5a48c6807e5be3c2e59d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "0bdfd73251227b87ce233bb482d2b690cf462ff0ace68533a1c69689894c109500e8fbf76e51a20ce086d59a0cdd717b0605bfdf906fb964abf9d2c2d4ec1d96";
+ sha512 = "51748833b7fd69ed1e09afd3341218d190f9ec0752b74475e17c205085733cbc77f95326ec0d401f66bc83a14f40e8b9fe7f351796f83639ffb0cce86cb7f289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "a6c55d4c646fe6579901b29eef484c5584c4f35115d3820280ef45d5d45a2e95e6f9dd5167663df2cea9276eaa4d3bbd05cb9550cfa3e9b3d3f1741cb1e3796b";
+ sha512 = "992b5e33e02eb32f08a00e7f3ee451aecf489cb55651ec9e60672e7a63cb6da6c511e08245c1f8a070bd29f40a510cebbfe9f5d869c6a7217ecf0d859cca8a67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "934276a4b149df5d511652c8a0e159a5f9bfb1d903e09d6ea171e89463d00fab344944b90751d28f4352ec09147f6ba02fa018311e4d0bf47994f3be2ea4fe87";
+ sha512 = "7d4a491c7c91a48bc19de9402eed14322136639a9a3c47322bc9b601d09e6c254b5a5ca674c46ce65f8fa2aeba55fe8cdb6427da84dedb14c6003fb49e060547";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "8e1cdc427310c5f8e26d321f4b741908e3413461fe7ad54b7a18ca9e3d93800fed87a907e0e4c5f689c4becdba3066ce22f03269cd668e98ed30efe577d9f3f3";
+ sha512 = "3713e66cda2fc45544da1f8224722069814d2149d83eeb6091ea4d5373ee06e5cfb1d4f8965bdf001b297a9e112c3b94a31d64afa68b0c1194d85a6f7c5ae998";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "de83fd739c30a7cd23eafb0ca2e0abfd55c1ba84d0fad159f99489d948205b4cf5cbc71f929b4e1ce1caa03f70b67465564986fdac1c0ab0e0a21df99849c5f9";
+ sha512 = "610374a1c75e8124edf7bb9564543f791018ea42d565832e1362654d3e7648db6f0b635bbe5d9acc16fab0604facbf3beb2c4c47f07ab848d0ec24832648f78b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "588be3d59eeb3413f18b642c392af4431141597598ad8e9d9625231c0831f62b06d591a997a68711d042715f939d57ef4bb7df481f3b512dbaac0e29ad46d55b";
+ sha512 = "f8dd4ab9b08f5581572f8a67e8f421e0949aff84f74e7cd4455631f09d42f725ba53b2cceb883f51e5849d66d564b565da4611ed889301495bdd76eabd7bc4a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "c261aaedfcb393c76ea74b0c0ad69a8df90530f9f39d49e69d6639cad3d9255090180880fc70e650b5301d7d1480517aaf630502fb6a750fe9fef23d4e25fefd";
+ sha512 = "7b30a8ed226d8944b78bf6fcc034c16a3bee70d32d8bc8282bee5f64208eee64263575da6dbcaa22f543a19b5eb53ae5e7d6c5acc213465a27630f355cef4b09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "bf743378ace07a33ce50752ae804a4fededaef212d38d102f3374f53a7ff794a777397f50e202e952dafd04aef88b0175f34af69b1265b347aac8c48f923dc54";
+ sha512 = "36fca8e986e42a9507c9b7637761d8b06dcb4a79c09eed04441ad82585e893e531623b61cbd46cd37f8a6d6911d87336ca7ce8a8f758637102d8b263eacd9f65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "61dfa74084c99644a38ccbb81ee0ea634fc067a27c6ddcfccf57d9b29ddbb0315e48dd17305417ad580f3864cb3be65e57776e34b7771d21f55510104e5d58ca";
+ sha512 = "0482145dbe53eb5550cef1d9edcfc17caa0160555e2e72203161eccb84a924bb8dfcfd0fe0433ce29f29621a54054a290d908c533b9e814e60545468f14515b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "43fc4a57484f67ee3e93373c0bf67a6b2c1989fd3f366d98970d68f94c1ec6514a45cab77e06c54f61a31a6ae0d629ab37157373cc56bae1752158db4e4bc648";
+ sha512 = "1854eefdd42fe0de827627063e0f05499b1d0d7efe2a6de3880dd25ca7a665abc45f25db34c3e27f52839bc8bd9702cae38c49c7c2e7f1aa2dc5dc35258d5c1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "303dcbe422e52be5276d98e062e4a9b46eae0ba36797f9ed1566899ef5c2dace22244b5449ceb042aaa75f72138d19e3f8c0b920541f36fd5df7aeb52d0bace5";
+ sha512 = "c2b9a6be638e77a691f583f513800d4363921516f30f5fcaff71524e06429501d5d9a076fe77acc1bed3d51628e9dc91425667b1a754a846e56ffc1c26d3356d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "75e73332122afd1e86060c57d0c0987fcebce290d0591b5661571514523d746dbfb43a55ba1ea95f66c91f3c045f7b944e14f8d65a372104a9390e334ff900cc";
+ sha512 = "d1af23df24607dbb394ca3e606b512195d049cfe73aab57f694198fc72b088dc8cdff671be218b5f2254c2427f36020a2c2ca69afd8f6fcdf5293de769de7579";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "2b6f03107cb7e1724a48854e88536809b7e235e04e7cbd7454ca8f2c952b83ed2a004e25f637f22690f4c9c73eb12fcb35980fc1e7cf4f53aaa061ff8a6066b7";
+ sha512 = "f555ddf60b72835b34eb0628b723c8570a671f39a335c02130238922f908e013c04c54fa9edab94aaea81df4e62b38cbd9d0f487cd2eebdc32f465bf332db340";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "aa6e8cc7181ebfc77c5ead071871dc0fcaec2a64bdc2aed4ef22ad43ad81b18aebc4acd600aca7ac83f5acfe1fab07154a9f15bd4e189bc787935d3d0777c291";
+ sha512 = "8e3192d2460671337f3b790b42d5e81cd223214915e6d357a0b3054a241d08c7d0d55346f72b2a314ae724f491cf1aba72e4398a316ca576956eee684c075439";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "c48abdd9531a39d3f63f8db2d3bd6aaf85c0f4d22d0297aa16734eb67d81d653aa6862ec7d48557e29c768f0431fed57ed2a83577719d8411dd0410d4465d35d";
+ sha512 = "f9d7ef1de1d7f83102d69c1d86945389dff84bda2d956b9493e13b33e33f359d5aa058cbb162e8d636da77358da5d3ccc5a401e1eb4ba60b7f77595feb6d9405";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "7d2c1faf418662c762a227c04b3b23bf0e7614001c94535a8bbc75d2b95e540de8f1ed059aafc224118550fca350d459cb74d398b0cbded1aaa5a46ac6198bb0";
+ sha512 = "31c792bdb9a2ac4887313108bd9c1f58dd98841842e991e682168062a6b497d91cfe5079a26e9b2cda520a8a20659320f0e1a93c29b90cb5c7d5ca47fb4e8953";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "d63443f220ba1c099385410e458033a0132110f26b511fa1b9d5f157dede1aadbd958019cc25e47f70cd0b30f7c6f0482427a5591a8b0c714efc46851f787091";
+ sha512 = "247b35c137ef636ad44198c3be9cefc0669a35303d338c7a99eab68dd4e45ca7701c614dcf91fe7ae3aa915deae880dc32c459740ecd4d8faa91ee360794d7ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "c52dd6462fd950c0a120cdfb721234300b84812b10fde3436f35c583728e5a6d05153eb30f9bd55722b48fc047fe096f8a2e63870a33b25c67e73477355b7c40";
+ sha512 = "46e44ffe2408ebfef01a5a09a15ec03645f1110363c9c155e8ae36e68c3859bc1caaf5ae38b55ed9d2c0931bc03dd285d07b5203693ef5aacc5089ca4cf5322b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "4a4a4a26e17f8d49eff0192d25afb02b11573dd4970a1b7ed6033695f4ff92ea7d0b417cbdea8e8677b8572c23d84878d52752b603ae3abec23a87436b13b9ec";
+ sha512 = "284dd43ed39ff77a1acc08e68036a61c966ff8bad1d8911eb2348b7db190b32f07e7252152d2e063045a181eb3d3951d2108646502118292cf077a45d60290e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "c663e5c4cabdb0328fff7847e510081c8800ea4f05228874cfc97dec3d88bdb539eb0998bd355cc5e229c8763819c3611d207c2f1dbaecb2be8d4f418f9b2f9a";
+ sha512 = "fe47640bce1457f417c8c90070a608a6c480c247e172b496b6d1e614927cbd9bffebf149588db273e906dca1cb7c1c0ca3a5c61e4c91e549177902184ed27832";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "bc19998a6e0f25d9cf96b22dd4ad8d131cb230d578a46b255478d658af83fe5ed5d2199adbe8118f18059734e644fe3658313df08978c25a785c0c61087e3344";
+ sha512 = "eddde48d778a97a5a9b566badbe3e1a8affbced8b8d2c498328bf0f0692ebb878ab80f6be0b6aace380c477ccd928f84a10a0620caabe18341d4fb44b4af73f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "317fb7ad0a8974b691a713a37a7a4d9acb9e22a9f0d542afe64cfe9ab5ddf5f584b8607af5deefbb46d5c8fe1161124fa73f02aa8df1fb8b77080b36d5aa6393";
+ sha512 = "16afea960446a746ca9d68749b2b474eca804912f238aec81a271705b3374e06165bda0f5ff60cb48ff5533263042b97770caa58b46c01f28ec6c544c7a99cd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "8a65324441eba950e4312eb9850d0033f3c9add390804141791a2ff39c43fcc042f2fc97073ed20dcd2223e67360c7bbcceb105f8999bd79c1b857c71f3288b9";
+ sha512 = "bdc9325d3e374a26a95ae4cdad850ee21232fe750f20caa435bf5a05aa55db84e75efc5992ba417088f2f89265b04a84dce83c8f1a7f4d4b8c37b8025ab7a601";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "665a95603538b594c4fe6d7b3607a83184e69720400022605215e229b4f103766b02083499f4c0c3c0d30255f478db81c4d0bc6ed93c0991cb7ead7a102c8dd6";
+ sha512 = "00a0714da1b005bc731315b1a66dfd73be3b8bb17b2c02916ee2ab74d5b16ba93c37f95c79626f7bdb254dc9510786463d38264a37fd1e5ecefa01f1daf09d7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "ad7aa47085404415b7bf99142480c5a4d2b2688a98b2d9ba904e383da0e25138f9e8992787a4cfdbe3830ba2f7ef777676e0700d4611a6e17bf0be76c8991bed";
+ sha512 = "bec60214a51569fe579013169f89c428c11e8848de93187ff35405fba581b3dfe57dae7cea740a8173640295fd5f85944366c3ef607af17c396e85f26fa29860";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "4c777f58eec33a68e1c10088250be80d018f54ca47d22d16db37f6e26a294e4bc7ba6551b1674468df2e8db4bc0f4c531b19efb8faa254782a2a34d606e59297";
+ sha512 = "ccc79057928f70cb1d499efb3acea41869d79d8cd6984735bd753f9f138a5b628be9965251b880fda3d107d511404953d954694e16cd53106a243561f2d1bc8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "bc7801da3a0d7374dcc11a44c967d8752027bf8f8c921dd6ce1c52bbd6a198ac0fcc61f7fe23985ab7088bd2b7fa4218e3ddbe0e2429a35f7492a788fe9c299e";
+ sha512 = "05e66edc75c37fc2cd29ce5ad307a999deabfc1efcd4ef2e9f1914efed86cbe2a9c52dbc6ca850547e3accfb70e942a5c7efe5de6753bf3641813a08576abf97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "6e6e0d4ccab43555b769942e26f9a60509270e7f90350997237cd00d717219f41b5993dfb1b7a55ef1a0c3bf5e4dea1e25336ce604482f19d1fcdcf0a07eeca8";
+ sha512 = "51ec1522897092a2d91a748d5f684776aa8b7b1ac1cf4f84a36ab955a2ebed17959695877d65185584247c19af4d581004e707ed67d8eeccbd8f7f946173038e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "f25f9f16af30b9301319de38659f2d046c5a03d7d9c027a9aab5477d5a65fe46218721deff5d635023ba87bd4c493bdbc3002707c120e0879abe72c87a9f08fb";
+ sha512 = "51570ce758165616e6931f89384d1262622ae8788f39717a8af291b2a0cefda6e6c9d694c04c703eca545d3ad4680c1ecbc84c68e60b28c7cf741eff66e8a8a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "8a8bb70b56db334606dba006ca4863f7c09d9ba546ceec2e5fafa5eeb6944e66e795ef4837933be871a4f5b5d63f8c2f918136667b955eeadab11163aaaab6a2";
+ sha512 = "c51b1eada1aee0e985e7eba9040a6b87b36c76e83df53b69d032c7dc3e6bebde23735a8a817a9e267606bc9528dc341ed4675158d222b3507ceec65f0152c202";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "3cbf6c26c1831f8e7926bae33c380f84f278c1717516e08bb2cac98805d5c4bfcc67d8cd37ce2116224b010d1f6198063e4741c4ad82b9526e4c042ac40b1941";
+ sha512 = "36bc39b2a9fbadc5cb30d7896df384d87c3005b6bb57041c1af681ec6b66af9dcf0b17d6be4aedcfd2aa031b3813ef6d3c4345484321d11339fc3178ec93e6e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "5288f4186b731c82ce1bb3edca0321ccfbca69882f0e2fc728c7d3effed36cc4a4c01f79d51fc52be8cc1509c4d516de9d6cbfa9add416c36a6c90543fab1e67";
+ sha512 = "d55e96e8c235f74df987ab589d6921d31faf3527e1eafae75192a26b9fee79bc9d4778a1012341e4be119b314d553703b4105d2bdd2481917218fd3d530100c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "9cd0537802f9e1465a9cb55a5929757631b14c2b61b8ba701b8408a274ba35de95a7df1d1b2af22ee2a3db9ef9d106b93ee6698eb411ff67bb0f7b9a56cfd454";
+ sha512 = "26c3ddf916c45d0f364b23bd113be300e6094d3b29d32df24543690ff53e16168a51979e8bbff262614fbe40ad6d0ddd249f64a63ed8bb03285eb5209818630e";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index fcfa88a755f..d79bf3fed7e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
{
- version = "63.0b14";
+ version = "64.0b5";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "baf8a78f63e7fe6b09ac1d5fc4cab9d51b7f43f5dd747c569aa9dc17380745b306a714ce3c166ebaf48f180a62492e15bfc3f1e4d597bbbb766101a9a984a68f";
+ sha512 = "81aac1100191780e1cf6b7ac8dd1fd12493b67fd73c41c79be165dc2f998b4d9efa299f005e982707cf347493bec984924f31ed96717205e12365b33a242e09f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "556958203022beeb2a091f347bb02dc6815cb8480dc05c92021d8b8290f7eec632baca2e697d476d63f52db5ffb62546f52b696ada1163e39abf4afee1d73792";
+ sha512 = "f68851efcfd8cf4cc4828cf94fa97f9aaac4af8087ee21d7b7c3c5bb01ce471122488eff26747022e73a5c0421a40d8ca0b815dc5cce21e68f7e5c36ba3f414e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "2ba5e5a9d5a4aa80f3fd30e85d2b94aa024d14d13572433fcf148d3211b9400a08c899cae57359b4ba09b0038d5e867e4266fdecb5da5a45ff14d09a38f864fc";
+ sha512 = "73ffee783d5d3dbdb42169a4bedc1c50f38e34062ee418670d3b9dc10a6c7f9c34752cf885e35e2591d1affecd7fe5e0dc4f3659b76354f932d3e00c856d71ef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "866c25745a7ef818e9293bdf3e5c0d64da71afe6f63157a3fa0ef0712cda2d1ffa6407ca2d9d4e240977f01fd71215fd9446f23a850c012f5ce86eccdbc5e3e6";
+ sha512 = "717a711d20d36b0983f80e662f1ec25d29c92af6ea5d7a8f03c63a94f60637495e6a9e6c170de8ba3b26473dd79cb4a1d5580effdda024d58af78445a2ff3a3e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "15bc92f11b42ebe01a1e3c908f9567807c8cfc2abb67a29a6bfa90d59f4835b01ff6b36272b9db1f6e5880fa7d38fbec5edbde7a7444ecae74eb8c429e89c8d2";
+ sha512 = "60bf2b47020e3e78a6e2e00a30c6d56039b81c973366076ad615890b4fced04bd967947abc75c80cf79a808b86859a1874bc8dd4bb7c6b55989e27a34f10f3dc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "4e8b4f5543dfa4f73ecb4b18a3ffc10ac1a50cb39e67ce5077d78eb95ce7664f261663051bb29354fbef8e8f0ab0213f1abbbb4aa7a9b6d313baaa787bbdcb7d";
+ sha512 = "f16f083788c4893715c8151d9ad5725a23bf4105d43e3728dc9b60cdd2eb50695c1393da8ebac5d45e5c5f0d9cdcec333569868a6d46b108a503c94ae7c9b100";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "211032b7d21542900298ddcf7157a7d40991a6337ee51e7e646327eec8464b28e054a8ad8a42003c998a5010427c6f7618405ea3b95dfd0e484f73614250936c";
+ sha512 = "8ee0f0f58a7b16b70e4843f71b9852935e665a670659915e27069d5c2fa33d8e9e10ffe0f47b255eba0d0e184ea22ee6ec5d0c0f05e9a74af280ac36b37eea6a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "985f1f45357ec1579a7aa84bceb2450f5fd8779e509c9ce8a01138f5c4b840ef18195ed1b7309e3d6d436e9002516c2f76a7a5d1081345b5a1893fcee43bd123";
+ sha512 = "82806e493c7d9177f514a043b4ab96530da971c2193040bc12fddd33bad71fa53b3c67acdcdf4484afb00eac7d878fd6ca5ef772e710b4e6694354cac8dbaacc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "2294ca16c22477953f9bb75c4be3914822c07c19cf7ae776d4108df6c3bc3333bfa72a129645487a5b245cb5c97a3ddfd225079be5380d2a9433e98d165022f9";
+ sha512 = "68ea491b58296bc2039f583cf8f0a2d04b7558b4588d39cf42863258ba5178e9f9732b6584c18f4833273e341dfc21eeae6dd6073e0d9bb4c407705f89e147f5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "99f1fd21abd3f92d73daaaeab5c9987728c7b852505e6b92a67cf59efad7115aa4586e34d37c77e4f5a3011c5a82bbf927e9a918c723221a2b48d64d650d9d3c";
+ sha512 = "56a8c627416c1f5a42223e5ffa0f6f14f838a75f26e71bbe9d0a7b3286dfa93edb29d5c099bf7f0e8a9f840ef86dca0d900831f82bb7fdf0672e69d8427f26c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "c1ee3e532fbd6eb047d2de9499ac1010d9ca2d4b4b0c19845b3d248771022d885e4c3fc159d6ae37820186bb4a2031e1049ee8af219fcdcf0873d0b585840258";
+ sha512 = "34f490a5395a1cfcbed9f2858f21bf17792147ff12a1baa1ab4d0febbc98bc3137bdb54ae037d3f641963923a9cd52ca9e83fb728e93b807f3077541522d5923";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "7e7b0c3fc861aa4628acd0ea6cc1a4d0b5015ffe2b02b8ef716861f1ec97122f1ea4bb60e7bf3c287ad77cbb91836513b6e073f88f8183800a77afaa2693a833";
+ sha512 = "521560eb7055f55aca2461cb445478ab3f17c91ac5304bc9f3cb3d85d22d742e403937e87fb58ec7d9e7c55647451510d043ce5696603dab76bb142d736c8059";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "6db4e06f0c4ed652f983415009079b7a92b73d715e4b5b629cb4962c533a9080c1cd5129f2d4f1d59dd9118d0d715ed39f76f976a50b0b2235ca220b5483f7fe";
+ sha512 = "ff43a09e4b19f0ebfa89b607f84e24ad1c633fbbff34b92f87afc73d85da28acf1db2b3f05af053117ff31c6a4f2f7293b8cc68fe77baaaae52d9d079b4f108c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "cfbc585b9404a9a1aa5a94eb2e8bc4cac923c557c9c2b8f22d084c0b118aa8b93cba4f28850b6e3e435e6456e63f0c7a2c029e9269db5a55a66d597a91b05235";
+ sha512 = "d6b55dfcf3199a138b0292f93a83e3fd12512a37d786ab4aff422dee36db26209da62c42ced0d2f13679c2bb4e33d2c3062d2b08f1efc5b9c3c55ef86f54485d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "1e96d1e9b91147dad5244514e87c1aabb1f7e17bde43eca2c9044b8085e12228c943adb540eff283dcd5be78b319beddd0161f0397ec4486109401023ab3c29f";
+ sha512 = "2bf7d817fa93b47db181da82cd2f4ff35c279d3403dd147e0eedd7c64919b5bae9495fe3cc683829707bbc659403a38502ff769074e0c87405ba857b2750c4c5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "0ee029b5ade528f59cf039cf63c4fb03a25ec79c4c8ddaaf9995a10572f7a26f446461d3948023c54d6fc5124200b11e331233100eccbe74c5b2c819358f0474";
+ sha512 = "a62f39843b5b9af972951e63c4e5ae9daf827483575a566099e1fd1a9a297534cbb8ad2d1c7681c1bbd69062a511705ad7be6fb8c7e1458bee63b142070cacec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "6270844c17a7c0f5e25454083acdaeb668bd76fad90b925762aefcfa3bf281116e47ab5946389e3a0791cc3ff43e1faee022e701421156e1991aac863dfd6ca1";
+ sha512 = "7a333ac0514b9cf910bfaebd1d0e7a1056ee231a36fb67746dea83fa78d7e32a14f2b6e7bf5a051fbbd41be0c2378a46f29faa54cb25ea897ac31792071e2570";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "2d2b84db47b7ef1023f321a001223b30596df58ca322e6e893797fb1806df24647c5c529063b503869e0c34ad9982902a252f5a6e4151bcdeb97ec5015a2b255";
+ sha512 = "3a46329e0ad1ce8c46318198f684d7291bd1caafee4ca959cba9b4826234527472a4ad3bd3c720792c02cb7f48be78d456c4d027d318807d6433c5f715d16a01";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "602577b05601b303eebd51d6fc922e60cf1706dde4bd7d9d1a9549a8dbd960e726d58b86ecf0607c3984382fa8ce20d5cf5152a84b01484baf9dde235efe948c";
+ sha512 = "635b85102d95d50ec0445d98d5356ef71da7cc8d010e9756c9fc33af36ca0c6f86a9bc1a4d8f6d74d9aec2586290471195eeb565f9161a265b2fae28d558249b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "e3ada860ad1b25dabe55d7497cabfb495324a57429d7fae70548a40e0bf613b9a8c699f109e2c93faefad774a05fac8ba59e7356f360547f38cb7fe96327f72a";
+ sha512 = "76703c4354dc9c504e6f07655a449aa080626e0dfd345196baee1eaa63245b7c4967fe539955c8e4e5322fbfc8fa68f2384f0925e8a9183113f61b872df67ca4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "efd92ecf884798196dc04121ad93a1a152187806f4b33829914a4e2034b8a131d5e58d2b2f455ca65f8983cfb39d6993e0c6ecb335c0246a20411da0d132ff0e";
+ sha512 = "7b2b3592d9c7834cf1dee91c49aa8dee48451d4eda0408c7f7eb27f975a8db8f5ba632dcd2ec65081da5357225c4a6af8031dc723a4d266972484a0724968a23";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "1933a5c39c8eca1ddad4918fd2f49b820a281d18831b5fed0193dd6a78b6ee3b019c5307d1853fdf14d805c5642b92982e1ef4079a191254c69f8c9c78ec3883";
+ sha512 = "ed9c05783a0f226487f56afaf501bb682a4b442a58d06ca344b79e358f70bc506a6960b29c8ab66571a3e53d97ab8aac8dbf2ec3acabe37ddad47ceb25146378";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "ccb03d4eb7e81f04dfb700016c0b84be72c2d0fa15d63460f36ef66a619bd2de7e98840f9600e2be0be4bed8f247ec4363b4544ee66a43540ae0ba4f6a00a52e";
+ sha512 = "3f72d87dc2c800c3f64a754dd6bd1ff598896c15eb63e1ac7ff48481c3609b34ea12a2a425c417ba1573de0b01e10d4c55ab046224edb6fb40cbac6db3a2586f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "e533cedecae4c0916b18d14a2045d0bd0acc5b2b812a81adf268280505027b034c29f584c71343e10d88d1b021cc6cd22481d1c36b50ac9a8504014db5741138";
+ sha512 = "ad422fad714e3ee5cc673fcf4c74b2ba3ae57f5009aa6d3a8bdeba830adbfef2c1f744f7e258b8d17ffd351af1e917ec09662f02a765839016a724d37744f5c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "a2996e9ed146f2ef5da7c837d5341be9c87f65ff8ac42d97a455aea5e00109c702295df393234f19dec6af16d77652d53d94a1822604367530a088e8b3ae6a3f";
+ sha512 = "eec901b5dc89ac13c2238a61f0d59038abb8f5f1a565e1d056cc43fc541de35a129f0d97ab9edaf3e2c0ea3f229d99ee0e870eda3f755d3bfb3d8d80785e649b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "2fddb89b3da67fd871028c1740887582be7414607f7dbacf7fa05984a593b59eaad7a2e96da6dd28941fc17511db2152a4bfd673a7e5c9e11e2c04d56be21a7e";
+ sha512 = "1b78a67706055353c3c8291e222431923d1016cf91748c4b220bf4e116d8bf177201fa3468775ff0fb478282ea3947e270c8b6840671210f01391e2a4afd5cd0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "37cab9ccb5254ca55ba798da4c26617acc75d47a4a8610e8dbcdca3c3494ddc32969a1743a440a2e6935535093b86520df94997bb01bae6185a12ddb041a09c9";
+ sha512 = "826504e926041cc0edc18b17e32c41cc6ce7ac9f5a1abab4be57806004054f97ce5fd6de7002e5b693b81ef92a1589344d29a4f1a7ba813d6e36f8789bd6799d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "ca661918dea82892d0e44277ac2513f9104485c897ff1239495f63bf976efa04ebb10e32817522f8a237aad7c85e6678661568ee456a8cf5a99a36b7bd6d6478";
+ sha512 = "015110f3098fd8f47a9df5ff33b16f52a2fc5279de442002276d0782ad65baeaa6e48d742c8dc91b7da2485bfac10917b1f7441e8f0436843c046dfd313b2a4f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "d2316270848dca3922e5b18264fae1fc8f791a9234cb234ad3c9a80f56c8e13bedd63e73712542509a68f9b7f9482a46fda56ea61478b44b9571151822bc83cd";
+ sha512 = "1a101456683823886d045621515f85e1e7099acba790cbf429d094e4e61c7778797fc921657c60865a382c34ee3505b5be13da726308ec95a844ec4ce829e1a0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "bf032b016c2f9fa2dc79b22fb7ae807ce9c744ae563dcae66f20849f8696d1dbd30404c629acad472e89a4f42a504b6c46750684e45988146747d505c7b81d28";
+ sha512 = "56424f6281e7b9bc1cc7e9f7a56ac16d4cb655a6371a90253087634ce183dbc3e9292e64e73755ae59c2b258b3fa549926ba75fb6e986bb615e27e4a874bc1ce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "1d89153f009e29709d20f2a38a2ac34395bc64ded8021897eab06a31fd573962b2166d8367432e30489ec0e5062e3b526f7077ed08b7177aa4744a50da33286d";
+ sha512 = "24a86e5dfbcff7d42e30483da3c72ddb1e85ffaa2cfef3dbafb5e6a8a5d65a80c1a5a41764dfdf46cd3ca2481e00e3a8c2977c3b7dd2cfc3e55f97b482c75263";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "e42f0014a0235b9baf6cc0c15731a70cb2ae6d35b477cc12d989cb383b3714aa827292bfe4943163648194f79ccd542ef03378ad119020c59e8251a8161df60b";
+ sha512 = "98133db0edc236c0699e7d436d31f9ff88759d93f08c2271889b45e33ad8d81cc92d8c72c1d406c099690d6814be95bf2cc5a72f8f95b2ed1d8157cc8d192373";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "e6d2cd4a97b45519adab8e0b498e06100556614f9ff783030bd5a06acde8dad508b8f4c312fe7bb97ae837d10f4d0ed00ab0add86c7551b97a6c4101829d036e";
+ sha512 = "973d5194c5cb15f8260fc9f035abd405faf2a511ac89c1dc2b87061c49c01c33a87f3b37e5ead26675a197408106f7db4486372cc4e667564f6f4a4c1448948e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "b44ad961e626c0964aea65673b54ec2555ad322d0ca25b7b1cd934afec17a2809a1c46ebb15d2a22b4ac597c06f2420e940e7f4c980cbd6aca9badf9c39fee3b";
+ sha512 = "4036608d60ca101474ab1e417241f596ab2736683e6bd0e382a4f32eeeee0bf5ee46132bcf72f71316dca480b97afb1623b823d0afd55c3f387580974e81aa48";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "9b8769687c95f867ccf53184d0012507c7ec6835779563c8ae89556380a44f61532f1d44b2da13e39998cceb4591cc0d57cc7b627ec80467c2ca6b291022255a";
+ sha512 = "42b4729cac15f33040a7501a1310522e2536e8ffae8b181c1013f6342b1d3c802639945676a022a8bb599d3829f063ccc47a5e37bf445016201a0786962711bb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "e9d8fb68d4adcd2cdfe0d3849cc59f3aac13ff488f34459e1f391ce896b5bc302cf48a3bd979770db3fa19650b764bd2980be5f62ea2853a7fe247a62734e996";
+ sha512 = "68982aa52660936221db6d8c2c752de00ca627d010d3c33bcf905693a5fe8f2faae0fa81e09e04adabf4b0542b415543453357f721cf31c5be6e06a24c921a9b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "52514c4098e6cb2a109e2530b7c59a0d9338c3c7085c5ee99bf9ed1c0400bbc1c846aa7e3303967c7d2eb7bfec691c4875418bba0aef2bd5133e0f7721edb71f";
+ sha512 = "19bf324234da4bc6de2eceb4a7a44af8fa72e37deae31168575376499746934679e311d8a17bb766fbc3203ae8245706e0ccf7b484ad4ef38fbc9f12ab8ef289";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "d37863818720ebac9d97f09464aae36b02c38ca82bc6a0eeee5bd38dd4e57ab98a5ca340a6dad4504ea230def09984854ef10ed91a4cbbbe0cb18eff1a4af929";
+ sha512 = "55ec4531c0b99d3de20f7089cb898f4b5cebd91a9dac8117999c3c17156f7b719a00cc0c393c5454d194247f7117a4fc6b8d724be353c58085241ab5b1081b28";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "24baa5cb6a00b40cb6bb53e1981abd0b048ed30c2898f5f7b24c2c3ca41465f5f7fb258b86441bb2a2327a461a2764969f216715a5be4e1744b798501e56c239";
+ sha512 = "b1555a090268b93f569bd2f370863821f8d83db5a02f06b44f672753521832cb5653ad586331c90a75a285eb60c5d4d7b785be68e970fdff959e39372ac2865f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "7a653d3262c3b433dac0442b03be5c358a357a7905bcb352a7d808c00d68110d4587d1f2155acfc69522374c91b44261b3f2f874ae2f17b06e492f7cd9fb4085";
+ sha512 = "f4291ac9f59fc4b577abc890aa5be7d8a39107f60e8b20c0d2376999d530c34ceb41dc06232ca0edbbe6b6ad4babf0140e2de037bf8a17e867161cfba612add4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "54c135c24001d57a79e8da52548b9589d4d1a5864776976fba20fe9be63f6b2429705e07f816aba438e6d6fabb16cfe309a5b267062a5e3a19ae3b946752ad56";
+ sha512 = "92c18a333e131bd331dbaa032f901ffa73cca2feef7399498e73576d3224675c0199339d2ac20074ee2d9e202df7f6cca81c2f0a39f562816a7e05ce474f03ac";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "e86d31256874667c80db2c568c0189dcdb0a5bf4e86390638a49ab8a411b5c4e3d8facd9c6aba181962a61288992d9c5f7506fab168005db93452e7d79533b5b";
+ sha512 = "1a3934233439dde03be043c1e07b8391319076e4033cd5b70830aab2a33c3ae935ed87d807e867e0c7f1b5c9bd220f04a1d5f1e9eab5744b1f7bcfe24ae29f3c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "1544ce91046c2c5dcce685889cfc6aa17032d3cbb8f6ac59eb8859916567922062c38d566d69e0fdaaac81be19eabebcc35d816c455cbc02e2e439ac7613ae63";
+ sha512 = "9316abe49f3766dad4083e02c170e4f631986f727d937f67e0b8e680c8338166e0a7cf89b6b244b3dd1723576a664ac4d3eea6bbba59cd12aea574c53bf1757f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "8780464509cbdbcdd7c7a7e21964881dcbc5e2e6b9289ab4cb262b63e264459ba85e78af89ece752432b352ac0c0132bd8f551500180cd6e0886fcad8d71cdc4";
+ sha512 = "97f51fa99e99227d6463e43a265757d33a7201dd9f48bfe6c315d788d06d20016e673c52545fc1fda2e96056457d77d5e1aa3f97066ce1fd9f6bbc39dca6504f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "5221765d6d4781dce88d9c4904e2b0c29b0328ff029672b1a4caa773a556fca3e871b53da5fb580b9878cd0556f5db629065171c79035709bf0a750d3e14f0fe";
+ sha512 = "61ea25d4257d72c8ed07f4b65be21feaa8b0fe26808eeb2f98e8ef5f3a85a44820c368541a4c19417d4d3190f5a198c92c5b5c1d1cbf5cd6c2157cf14a5794d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c4f61ea2530d279df1f96ff29631c43f3cbf23dc023b93579e8434539921ed9705e64f8d4f0a4fde1980384505b237c926b50a15f17eec5bdf2599c9584b1fc1";
+ sha512 = "cb609d6635be14f53d89cc19396842a2aa389decd48b817ad4788e5fef629f9bf336ca63a513b4e876b15e8c283679b77ebd5dbc0cf4309b9d8d50177d5bb3c0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "e06a424d115b32bc5225639d6fcb5251904d49730613da9e308d40f681392b992b4aca1d251d2a68921b2bfd270de1506f5647a59d42e9c1f6305347f0fd6328";
+ sha512 = "2bedb1c0d7d7b76738d112fa731d8c92dc7d9408c4936d408950b026f6b70b8de288a8a74ed6fab8f331c793ecce10fd267e21580a814aa604ae62677d57db4b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "b856071f3cd1a90ae12b06797c2b3eaa8e019a49890599670e5e3d564029052f27b62a7ac6dc80056cd6f1be6b05bfff44a1341a5685514959c69462d5c68e92";
+ sha512 = "158e04e00fab8ef62f375395d4a8c969c4b41fd583fe26046d1989a784f42b821daf341ceada29fdc2dfb61703df071578ba8bd33d074a5f15c7840a9127f5db";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "5355629b1db1cacd0fff5b681da7fedb234a19187027925534ec18d59e9e68e84ba2e1f86c0969da5459ead80b2bef14257b6c4fd193e492b7d22c3db7c498bd";
+ sha512 = "88b7cc2f451439c909cf965daa653524c15b38d121076d7cfad551806138a1974fd3d5383b511b57c942682ef307db9cb59b0dadc246de515c58d00a5edc630e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "59741fe39778528934766b321061dfc7b50853a6c2aed9f1316662aa7bced6a2adc6ecb4598bd7d8e4180e5b446d840b917794c017f897f4800b6722ae6e8192";
+ sha512 = "73462dd62170339ceede8adbf13dc067f3dd253fdbb4bef1321506782797821c49126b0a876159861827876f5a9c2f674db53fa79081ea1b5b8ab07a676faff1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1c90d23e59f2a499d98715e8f747ef80361130031345aee44a85bd385a802c13cc55a04374cdd18ba85a2796fc68a749e77a23f1c4d402cb0f28c0a70e9d762c";
+ sha512 = "e94a7270bb4221fda6c525c0eb0e15ec6b5480baded71ce03f17288e5c0523e3d0043ff3b278259ba4ceb76b9580d99e5234668d2d05a61e1532b23cd8c78267";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "fae18f485444ca9db42b44759452ccbb814db34a9f5e95b061ffece9492a9dd06fa0d83b898e76e33882c5fb3dd353b343714ab74a7fcc83314e76cfc248fc70";
+ sha512 = "ab4a5c6e16d0c8275b8d319916911c504ddd642ce0f523113620491a3e415727700d8636406c3a870fc491f55e9e96c516a32b564689656647f72345a384e704";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "5d034246e87efe01eeab0d3b209f968e861cf2c2d6a45d64be733d944c0e2c9788db274c21d470abb603d2522b3fa5705c5f3990ebfc3cc4c9fa5f641a98c07b";
+ sha512 = "612c52a9405d5a8c1bfcbc0e14f2e9d5ea30318276b2c5042df6eee15f0ef6adf724d3f8e82effa5bdd1ce352399c4316dacee89e275fbf71a88224d747cb8e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "1cc70ae6775038225a83595e74113b3f14650ce0cfb7890945387afe638ca2a8a11ffd9084c395ceeda58b36d15f89a6458236964c6e4893764312fbb85f2893";
+ sha512 = "45a6f17197b801cf7d0d69fac67876d0d51af25e3da044ca85304116fea4a440be2256d33fa6b83a6612f564a7846ba74094226f56df5dcb06586912b7051126";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "4df6f0b331410e8669eb450ccf57a959dff94b3b8941baf9e14d033fc43481b62c89351217a65c2e425225b5bc412e29cecc743c75f751e7d4f54817af1bb78a";
+ sha512 = "588c4ac270443ff1f06ba6df52ef0deb97718c0b1e889d16324e50c5bcf40b05178f41777a91d228d3eb2055cd527407dd00f613abfa3e45f56dda11e5ab506f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "dc524414f0da850b15327a47b02f7f1852095aa6878a1015da3807103ac9cdb54a7dc1126a44a0dc02e12edf593eedc3db7e11905079fbda1fb6cc3be94b2a27";
+ sha512 = "a7b19b76d0d1d029d4779957c5b35dccaa41eb5adf4ae0a5546c5194e6e69466aacdc4c257f85998260b13ebbbd7a53f697245590fa71834a46598b950177121";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "bb003bb4a67b6ef935ba8c90aedeeac77c813c26bff798927c9056f53fa287fa69bb07fcf998aa1603c78b7f22238ef2dc91442f73c22a2488f7bbc887d315bf";
+ sha512 = "4989c898cde62b09d953e91efd9746d0070fa8cf9a18b00928f2b03f4737541ddd8d50ecdf01b82357618065c2ae1b08b35c5b049abd30b1532034e0789b8ba0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "eba80394d9cabf5cd5de8cbbc1a91176df19e9b25604a0291f17fbf0c84b4a6dd6a4139b19a26d6f1e112cd57acfb3b567e7d16c8ddf9854bc6e8d44b9672e62";
+ sha512 = "a8af1cd9b9668bf22bf42fde6fba750f9e7e8786d7e05cfa0d37e79e37daa8529e0acde655ae23f45c2b6e4c46716d90fba2053a51d84bbb58b760f541dbf552";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "77a6c5a9c18534ff6ba70d52760f9989105aa72266ab7ff830d4a8dd21b028d42d209068c7c023b54098c9b22a1118370093bff0c9fdb3cf779cd4058e6756a6";
+ sha512 = "03c7d8711f7a847144a38bf4303ad492994b6e1ad86f1c6758e048c89b5c28dea2507eb33819b2f577fa708fee66f489df9319cc99a5f1c497fd405dfd459343";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "3e0598765c0e05f233c73a5198bb94fc506dda4f0653a445d2d03968d709b6da875c03bf088efd2dc40e56682f77a33b848b6d29ac5e31e7ff7e5ac5d2824255";
+ sha512 = "d157eb6b3cbc3d540ea8bc290694ed651c3be2f582bd662b0ae1c052759685ecaa2a4cfbd6814677c048dc273ae95e4c12b2e199a5c4a202885511c65c59b3ca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "ff07d3dd2d594c8abbac8662aaeef6beff0d5465205f84c79e1271d3ed9ee935548444268cf072d26d8574bf48bf69c5b74a3b451c93dfc581e23f7aac5ade1f";
+ sha512 = "0ef3d34d04d3897b3adeb7d5bca3959ad2681c5c1986c542c04b584c16c052471bd2b6c5c35ef772f7033d5806f3528a263b79d88566815696a1f7bb7d823989";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "235b13b9d3e8c9d8e43265c5af82f7ea0aab3a0113787ab9b5a52aa9707a0a6c443ce6469ea88c34397bbdecceaefc570474ed05c3e9b1efb5576790638bbe71";
+ sha512 = "ea88b2cad9411a347aea0da17f3cd97c8375488b699f1bea608440f604c0dda4199fd341bcedd721eeb06e701c8b05baadf4b4ed1c437acb11cb2945bb8fef43";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "0b9d67be23502e1279f895566e69fbee36452f6848f8dc814fbae23ded7b09a06850bf3b99d42038cb532b4c309f8ce21f7f4bb4f3eb74cdb688278aa23bdc6e";
+ sha512 = "35b468bed701d8d961aae420ae674a3cd249d8ecdb8038f1e89b6538a1a6bc118940df150d0c9bb372da180a14f0ae24cdbb18ba562b73cd9fff57e595c56228";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "da8458afd3b0f244d298ce70ea50f22ae7a5b2070078ecafa1f5b7dc5838430e6ffaafe9c333eaf81e21b11da9e65ba4feca23ea5abcebaefaa7e05f0865a7f4";
+ sha512 = "ccd010af8e7e0fe1eb399e7bc239c9fab4a162f49a482db7e75f2ef60f35335d0afb0ef4a7abc7896f0cf702a42e045099725898bc687a50c6aa039ea354e929";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "4ac011104c0d52f418a712321bff63310575209b4e445e5bd53a047b7d3da2c62389862131ece662b7460b1aca57c51bcdad2a5dff2b692a5e1c40b154da2ffd";
+ sha512 = "e9cefba5184026b288e73d6b94a35e6c3624ddf40645ca74d769136bd92b24ba50c4add4cc9141cd237ca87a5b5caa0f6a3c487aa4f559676045df533398b4c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "8d37b246a9b9b527e188e557c496df0f2efcdb92ade95ac3e34788ed5b1d4d9a2a748cd8ccba01360cc9e3273e143f63341fa4b87e50c1b30b07c3da884ecabe";
+ sha512 = "ef5f47c810c5758c7d8e03cfa3e856b219fe9856f811f72b566a0726ba0a2932324ec342f2135908f894f7c0359d153690d0cde864111d1717c303821bee8a04";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "5d67846ccd9b1e5550ac51f49528340a31ee5218169af5dd93a37e034feca13deae208610d1e2ecf14b515ad618e40db2857bacc043dac0662f9d9c4e1e86816";
+ sha512 = "f88bc8b0f709d6f3388bfc634581c2e47dcdea8d63346efa9a939ff9db2b828c0f1e6e78178c89bdb821233eefbd8c504856f8af3d88819392be720c498e49c1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "e55d0d24b8cc6ce22f6d16467631e857ebc7d7bee6bb3ecfefa536927cb7f32af08b5f0b9924286c7a2df8ab48c12d8af2751da9fdb3e012d1c031bea01ad39d";
+ sha512 = "fd84eff8586f1db62baed0fa483fac26b8473a16b1caccda4c6340f7a3098560afe1c3696c7aceae84fd3091527a727a2d256e7840a61b7a1142211e80c3f697";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "8820195b803b46b4b01ff27c1f2dfb5182b96b329cc7a0c0a22e25f9507d2f2138528beeb4a2e371f432ae2ab67189c0f066da920d81adfa6790e7735d6fb79f";
+ sha512 = "9f83bc551ccfb669bacfb59e90c9c239fd00615752b83358f4ac1110329df95678517cdedeadc6e6a3c96f8c41473ff2e60bef23043c56f384452bcefb2252f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "76f9fa940003a7d1596db4e8c231c2e773207a36dc6c2d3ccaa6667211b6015f8d8d5d7fb799ad86f9731184ac338d0f07e1ffa2220c03710dfee84d12937d7b";
+ sha512 = "0bba062f46bf1d52381dfa6de465b98815c8c727222caba8e7e9038473f9758d2d94ebf74027342ead58f91324be246b39c27b735a92f5034c8d4a3e270fc7a6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "35c90c990926cec24de48d3748d49285d9238a8a3ec7068c219145619f3370c0f0add66b364fe17f29b0db221b588050c6445399410f568f89bbe8d3d7efa978";
+ sha512 = "a218656ce7057e636678a4636256530c3121ca57a21ab2caf1abd468399bd0049deb3a583c0622df54b4245263ccf2f6b50f83b3ba5b941f8d2c4cc3e913f84f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "d5d851790e746108d98160d96bfa035af08a9ad27134d377e69f1b08f059afe751a6f516e76a512999420662e0c58cc1b1c06572fe596b86975efede5ee28349";
+ sha512 = "7681f80d70b68e4db99df44fdcae41f0d7c53d057c5a4604d2e5e5685e1dbbc35b456113ef56e619dea9c157951d9e2404125b75c99f76d1dddee484f886d948";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "27f61535766bb7f1008f900147c387d611ed7269b6826af271ddef98fab22b7db73f58c452130bd1d31303ff64f75e663dff4d2bd533589f97d183bc731cd9c2";
+ sha512 = "97f71a8f5d6b2595e49a72de736804afd59bc937b4a082dd9d2b6e0376e1da42ad702f4121294515fd399eebe73fdf67befe2e3a32e1518970156d2fb1acf160";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "210d2981e4c48f4b9381558ab77e9f55e9cdfa450adcd23b4348e8b7f554fc844d4de8b48283d14b7588c86843d1a2c41acb49df12d167099e42805fae268980";
+ sha512 = "6313389e0b4c05e2002c74bc233365cad1e8d2ac1fa381096a93e3aa1eab6e7f4b3aa5f793f373f8da88ff47d951adef16ac1d31b9bd1553b945eb71bb73e0e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "09f5277ab266b671633f11eaa4389f3ca0e3ac2ae9e8b0c5c4cdc8d3d457a6973c213617f1f450bd4b7e598bedf5cb0820f06ae55846b1d47dbe34cbe4209804";
+ sha512 = "99a81b88fc9a4962406f929b052cf324275b2b236b60f71eaaa4faceeaddc107b10ce51cb22c4b29d58107c582735f17de3bd6f3ed858812036f53151fe4ce27";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "8f1071a5ef4596355f17e65c1cc06641f224b53486c9be9aa7ad8ba8e240239cef9dbd913c44f1f0136ef27bff152e0def1e3366255bfe555ad87331735a7789";
+ sha512 = "4121b5dc0fb3f150ab985d2a792c59666d76054968e8cd657c58cd6e7c9d8419a64dac04d5c7d6b6989c9c111ce4ee98a5e96f5565e56be28c0f11ce6db9866a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "609402cb9f3ae4d94ad33f0189e85681de1d356bb97d73e2b8c682b4e664462ec486a3a757234a7353c08a92ca7b5b3ced349c1c10e40e78950c493c09d3d788";
+ sha512 = "32c9e49b4a51fdcc2d982b21783d8c5b9eb790c506e57d916722396d2bbab82e0b08d0e97d95bbc994639ebcf65a70fa8179067db5589ef4cb5c1fba8956c348";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "4d375ce5879b9272396868ab4a70e82e8e1117dcb07d8d1e8780d90d35c77ff6b9c94179ce48233ca9b6e1c559d7c0b339f49066366b15ef2adc563cf358cdd0";
+ sha512 = "c55470dc75d2fc41194a38edf686f1ea1e35919dfc2853553a3e6399770173eca7f7f8ddcf79ddeb346b73454dc21f1c31bb4e4438b157dafe4ea50671073676";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "1583dcaca18fbe88ac598449ad2d352a6857ba80bd7e97d07beb282b270b7277ee58992e622ab6a6fd66d9393dca4653c7e3562c8d7c6a006c7637162eca0e73";
+ sha512 = "8a794da90bdca6c8103d86a46eea907cb83050b15aee851bf9c7589e736a008b0d302dd7b33a1db1fbf4ffd09916e5babb5f01bb2ba7f237217c26272d681965";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "79fb6405d9db8f6fe97dd7612574863636edaae54ed879bff5b2b137bec006664684de98e94c37c0d64f37c8b930b075dd47a47491b8377b8b1cfc351aa4b6ed";
+ sha512 = "29da12673c2d2f44f287fdf09e3196ede2bb0c16c2316478cb544f050e1bbb9b917e305478470fd3220632ffbcdb3943030f2e3575dc8ddfb0322dd0ba9ff0ce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "eb23667f89441c24dc38835e5fb105e24eeb3e7a5d896943e796a92f9bdaacd654b984cef060328d8df6cd659ff6ced32d86bee5c3372c47f3106ce95e5f8898";
+ sha512 = "b29fe978b1ea5bbf8d433fd0970727c792476798f67973e05893e871f636bc74d2bdfb9aa0a10446378df3d5b07a31aa7e34e71852c855ecb13f7703dc7fd3db";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "e867a968620d23742c78f6798870a3e96c38849247fe66e068fd92f04ea78de434b6f4faea9e5bb01fe7dc0dca18285e39310ed354e24fac12a5c86a6378cb63";
+ sha512 = "342a9a25b0deb04237ba01126187227d6983ff98984af727ab8767687993c9ab433da715f7955f2e9450f82b1da97be17eae5803509381b9f415b319cec822cd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "bbfffdef77d2aaab7c2becf876b28fff518ed6eb3a87d96d9faf2c62dc0861a1a33a9260e34a3f4ad2bfe475361234a3401fa091531d1c90b3179fcb0a946aa6";
+ sha512 = "90628c0c8b7ac0b7618f9d0c3fe9f12ef44fed90c59869666ea0c086e41a337ac4d94797fac0cd5caadc50fa3d4770d1c071dace976c9ac14b60fb3cd0fc573c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "11101ac18a3f473028407d413057a9801afc76a898126b65b73bab057578e6d8f2eb2e9b29cb6be35a5375ac59a11a3bd6918c54a8fc23fb6caf35ff7e667910";
+ sha512 = "21b134325122455c9f3b9e3b7abf30dd0ff1480c617e077c978d06d4be657811697c237d8ea5974439af01a0df2e19258116289184229d765d403a753ff045f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "be40096b63bcb006c587489fa99abd758fe3a24b5f965f9e53b9e2602bfa37a3f07fe6660f7064fdba6861a8e2bac5f3da5b0616968ba4b88d1868d0955cb0bc";
+ sha512 = "1b41c4604b7e4614a578278cdc17d176e68197c1560fc662a41c3081804de6932fd57b8c6fc5b9848e5efdc0de42634507e3859baccd957d1fc14f23ee46741e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "cd6b1f2e826d575865cf51fe78f3872c50571c9bfeb726f4a253dfabe3af3a91ca1fd238d5b5ee73e1a01339c88444fc3dc3a1ba38492d6b99924c597dc96fca";
+ sha512 = "9d1fdf818948d9ec89b6b6ca084c34b85038fb502e455be8db93635f96dfe4cd51d29396190c7a75b36bed7fd52555370b340e54967258df9e2b4c1271e68a0e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "f0cf8e489db3cd8b7fc535a0b3a95c67f6f63fc7c76d5b1882e3fa8d17ec18fc751aa91945dcda984ee09547ce161b8b7965186ce0013819eb45fcc2d72c9391";
+ sha512 = "5f8875e395f7df78bcfffacd0bacfcbd6c963a4781bc20b6c58d047f2021313401dc05216a15cf94ab9ac4d765c03061299f6da174b0410a99c4f42b42a3b507";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "12223fd3031b445d4b413cc48b74131793f3c2d8158e7aa7b2271d6b94645b33956e066b30fd4021dd36fa0e32c08deafd3f5c9c1fcc554b87e364715480a5d7";
+ sha512 = "45b59535abc9c339bc2ad6b574801af30bf1d923d1a92f75084c695263868adf5f7a686a6cb35e7ee0d6a0df44072dbacdf5877981ee3d2bfc7c06553504df98";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "97095e3ca525aa45f7339b5fdd171acc7e0758c401924cb2721e368513c260e8094162bf2e22daf5f34fd680416dd7fdec3f5e3b65b6fd655be1ffd4a1850de2";
+ sha512 = "1b903da600a61ebe4c0b310fb99c61b59100e21226e6c61cce85b1618ddaf672cf595dc4371948c8baeef47ebf5f068c192ba963bbfe5b77f70ee0ce5be1c72a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "739142d798738f12758d335b8556f518dc8b2784b9517586215f82d5653059a3cd98539c5784ec3461529156282f6246d93220a7d06208872d9c90eaf08582f6";
+ sha512 = "ac37414b90ea357475a63b02c26a9a332809201cd29dce2e145db8690cdb6501476f00820bae2db2cf018a4b7a5fe71e7733453403344c8575cd5cb73a269ad2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a138503adb1f0ee2197714fb1e0db4b5bfb004b64205835078cfbd51548a99e0b9d920552130d0646c4f16699b084e4fa88eead584846be9650964fd51ef4882";
+ sha512 = "502f9fd0d17f08ea7391cfbdd826ab934efd2a6f5e21a3271d5983d9d3db5be467d69832ae3bf510f5718eae81918bdedd820369021d4c716f826c9b5ae86095";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "ae9f2a6f83816f02a0b0c2240cb8c6eb003b50b3b9cb3c6b959b3c11f6b87effc38f40daf3d4b2b33140fdda3dc99a5f90af582e9d78689ce1cc965f5a88e119";
+ sha512 = "d9c49b713c718f8519dc9cfe2931e5211cf3a797695d2734c5ba7c1c14ab0b088b1bfaee383e149830d452470b9eaf7e8889a9efbc0e044c26258bddc830dd16";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "b0e650c6149a761f202403d0e4e4c75e976657924bce2c10d592c5669b7a055ff9d6a82f1795b5fae2f57c6d49be4cd6923a36da73e300a5b6d287f442be93b2";
+ sha512 = "358ee397b2729111502c00c14e463dda4669a5ce071293a9f5ebadd5f6c444602ec5859a6c92c5ae9f8755c2e4857b969d63074934b0be4e4fbd4ace539456d6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "c7d7c61d810042bee0f5befca5c139550bd73efb67785b87b21a002521fde0d415c4aca753fa47471fb7489bcda0f9248426ccaa8a2bf0967f71f5b1d4329df5";
+ sha512 = "b39c6063620457365790e836c2e52818d63241d38911fda2df920fe0fcab520b982ab84683a1d42f74a8ccec37355abc50fcd528a6f51bfa80d5fa5742bf0e9d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "6e79e3635b68ff87d616f8626475684b4c18626c9e8a2bccf99987e96124a31751c6c9638725c8882146acd9368a290c51fd5726a9b9903f1b0e9f1ada42e6e9";
+ sha512 = "e0a80be5432e22b3f445e1cdff70dce8b4622ffde42bb77dda8d1cbb12b539edaf249ed57400ccf8d9e147d5dff5ebf61336756d1d2c57f6f419461dc575f3cc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "d4137788bc763ea1a2663fb0bb4aec3b7af412cf1e38ccb9fd484f9f486b877a19d86d17fe9af19df12104433705053eb374dd65cb76c6b180526871f0d50290";
+ sha512 = "1d566481abc9c246cde2153c02e45edf0b03d9c8e4eed9680df76532ef5c39d0d900778bb6be8cdd48633168935df318154e4fe9cca056f0ba696d9019225905";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "614d803676b83df0ded1db004b7f17aa66cef14e6fba2f20504d1629b55ead1daead52fba7eacd66e6519dc41ecd5802f7c1ec49b6ad5b402129528914d0de69";
+ sha512 = "0e3e520084603e8aeeb67e2f5a9206b7a7fc15b13d4abdd0dac1f6bd7f6234b0044f6656e0457b4012ec7c4efae8f7ed9dc8999dbb43131794dd2d53b7f8ba74";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "741671e9bc6d102873b899e649d733befa3e4ad26b2429f04e87073eaf445a9c571087602a8c347cad0412a9efee7483b9440f794248a2dbc30962c9e4a599f7";
+ sha512 = "ab4ff188c7917944924cf29fddc78946b15905eed83dab45daa5efe87f834a292b8fde892d870490f954eee74f8503b82ff2259d1398d5e16c71b483d39f13be";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "615ce8b1f44f02aab20407dd090a7f7aabee0b022b616d33e2d7992563ef8703493967a2762df1457c6e520a886a4f03c0477ee79025ec36a4b345a0aa913362";
+ sha512 = "9a37f5fc55a328b032d21088bb1989994fc2e63495e765822e93275ddfa99739113fd4724d26751840bcaf56bece59e77ff3f7574e97e946794cc475c11bb4ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "070e6e47174129cfbc530975bf5a59ac055e942a2732379578a30502b109b80c93162d144ead7306a8604c1945723bca0666c26d1250cd17c4404d5164551d06";
+ sha512 = "1147ab94d780c868e5c2bb45f0739a9cd1f69a03b4ade4a4e06f301a576247e73e4aec1422d4de4711d0134a1a1f3774ce9fec54ac91b88fad353f8b9054926c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "e808f80625803ef21873fbc52f82569b086e20671011049761ea1e9562c57df677a3bb4baf147442d1c699f7c79e61b89bf3011a47457940dc5497ee03410b91";
+ sha512 = "22330ec29ca5486905e36a7e59a077d33d8239f3f462a3bb49fb38a407dd5ba15ea5979b032d76dc8eac427cc9305a1a207de6f147a528d1e68d69973bcc94f9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "45fb2dabfe3bac2bcd78e659a03140d9e75fe9ff9a458037cb35f7bd2eb81b6c33484b1b6766c72e03705020f25cf98ede7a5946e99ffe59963b054d27ce05e4";
+ sha512 = "ec0aa858937a3683b496e0569433bfb6d080de6f03fd8b281cd920afa58aa0cff7212b077c1581b0cedd7ff47b4a0523a361c2fbdac14b8281bdbc48422cffb3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "7bb953deaef6f5d3c09f8a62a7e2abb285e9f23a8b6a47286cab12b2de9ac5fa911dde47c652110b635cfcc3c28312e348113ae8a791a7e7552cc30d9767f3c6";
+ sha512 = "7a64016633b1b8b4a505a387d0f565b6f42ee6b0fe729d0f76465db0231c14e00dfc263bf96c646aab09b40edf9ac6009055b87acc64eb087cb621d3620375eb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "38cba3560bcdf6356c10ee2813743fda65563385510588a5d58703b4ed033d43f6ddf1019f18b29ab803f25cee5cf2263291eb49969d998b26fdd105bcd14312";
+ sha512 = "41b51269a45f2250e100fdee3bc0ea3fc1714f9ed104d36a51eaa1b26fe852eafd586ee95f34f1690f5b1fd88b56f3667dbb155374536daa2637225fd8f7a3f5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "1d632c4fa3e15145dd58f311bd3f4cb731fab4646f6a54bce4d5d58f53bb58964ddff8aed77cf5c3dcf59a00a9441b0f508bd9a031b79448009fdb37b501e249";
+ sha512 = "055e6b6d874cdf10a80c9d3ae64cad9a298e0c7d1dc15dd175c9060f71187a7e212386e09334e7345172bbc8f1ced771cd67e46ed7ec0f3320d57f675c007091";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "3b4a42141d00480775d96db00376a66b4c65d9702a91fc5390805298f9b94eab260c6433aa8ae9c1c2e79f4706128b2771ed058c1196a40e90dbf1c24be880ab";
+ sha512 = "1b3d7db566b9ccfb1623a812c6bec619bdce2cd0c5e16e1fa1861e9a599f84a4f4e13f436a5559d29c1058022c43aebe7aa913efa2d2fac382ea2e477fdbed2a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "aa4b8a4dbd3721e8162d391108e209c02f50d5d681e31fd2d4877794c9d24c8d2669dcad7720832c6dd6bfefcfce110ea25face288acdd368c5437d77b0e7466";
+ sha512 = "63247e5984ecaf234bb2ef53335c992b9630936ca2a13d7fa00e263edbb365a2da49ed5125c3a75e92a0a7a9f53c6c5590c9097cd3adec252da2516fbbdafad1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "b9df5e8149384a09039db582a4548994ffc47344326feb96cd6f6ef228e3a6e222495284ba0cf35f9c130b871ad827dc31022242179c88dbca86c61ff5185aa2";
+ sha512 = "d81c639ee1dc900760c44c8751dd63985eec2196306215568adc0b988fe973a9f10115b4b8c2d24f75713450161281cf4aea03f83720ef2fc27a5bc2108c6dc8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "a58ab41fb6282e64447021ec4b41ef1653ab7ad11d3b2947ed61d6d711061c476cc19d20320aa70fac30ed106869a0f88e8a22ce0e1184d68795a25bb8b4b4dc";
+ sha512 = "96e7842e71f4bf4f3430d2e13a814420b7433b0933d697313103d062f4b3da55a62f6f7538e84d8b53c6e627487f41b916c27b0aae6b5e537f31c1a6444228ed";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "5a690010ceeebeeb9130fadcf04eec5eefb087990ba254e11a5c6f67561bea287783656d1cc9ec7fd1945afdefdb56dbe93eb43a7fad6ae130a56aab64652e24";
+ sha512 = "9274209f21853a03c5fc6617cee96be8267cec053717f74dba21fe8042b0e22b04b22096b91c26d8b887dea92b74dc113e4c4a1889ec01a78669fa79a1a2c02b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "d2be7334cc018260c299879c9c9c64da71f62d44f8f0e0262af6140fa0471faa9354d9289c4146e9152e1e8fb7b9791b8169136f4902fabebdec05c15695e15c";
+ sha512 = "709924f55418bbce8d5d4cc903dc6f8f9e0e1e6047744658f8ccc8aecb13fabd475b1e1dbbb99c6f4d8c95d0745ed940e8c259420b9f4c941879199ce970eee2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "9197ed27907f509e1dff0cd4f4fa1d7309ffc1196b937f77ea0623ceb772ba653568b295ef6532ea3599ef7df5a7ce47eee55663df0f811b006ee303bff8ba1c";
+ sha512 = "083071a5927c89a233e203e34655e8d094fde5cb3d2644bdf7b713005c88f61d17750daff6076cd01858d7c51fb7265c7af9c20a11d2050568ee601e83127d45";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "efa6c11c2137f336576abf75b40b91326fc1593aed79cfe78fe84994b275c4f49c9fde8e6f45379333225bb41e50d8815e64297008816b1fd93367ab849955ce";
+ sha512 = "5ec1b606b3ff9df57963a4519ee42cf39d6a0d3bfcc87e4767cf853ab0b5b412a8b790bfcb552f8637c0f2ae63e4b4e6c6c896ff307612678aa2cfcc5d465b45";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "465611898bc9bcaa69a6aabcbd214f8f83fac62759d4bf2a64b9f07e258dd6d5f5c4ceb17682ba9c885f97b53536ba65acbd772f692dd6e40bbfe41ef1b0bf4e";
+ sha512 = "fa3f55f8515f54190bbb0607e26e907253b13bdaae18ac732da96750fd206aab2b4930d45f615f9aa095c972655c8c64d19961fc6549d17ad607fb7d81236042";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "e6c2a3f4412946576cc91a1ecc45e4cf18d2e4547c935f45ff776c736faed9513d777ca443033ed7e99f4a4aee11792651617c658d4d8e020d67ec302c457613";
+ sha512 = "476a0a9a68e659f9894cc55d697522f323bffa7f432feab90b67a2160b6518b1f3ae1f7e8e14aed0ca630e2cde0571b206146cc3cfed4b43462cec2408dc1c58";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "38136e7cbdf7d6b297ea2e183747bbdc79f61d8bee2372bd6f40c1c407e24eaf2f21dbf92f3b96dfd116437e0212ad20eff53ca512c2fe129c395e2d117e26b2";
+ sha512 = "b3d6e2c250c64e22c58050a266e95ef3cf5fbb49bb0993a4c471ec50be1d7c1a35183b80fe147d67ee53035e4ee203a4e26d5a8efee6985e8d0cf5a41e513a1c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "0ef2e6e928a04d8560286b01ff735647aaba246d1f2d6880644b7750d1cae89e63858ad98332c6cee99edc051a50f3c560edd4d20d836dbf7f4aa01ff281db4f";
+ sha512 = "786207343d449e5c3b2fdf5f2926dcb84d11dc9b7903af050fae4aab84b63fe6da3ccf2a8679745a7937620aa1267f06eed4ed8e284a203e665036c37293378b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "0e66e8ba386846eb140cc9f6606b9b0dde49d1827f98345801967b02d87c0f1b6071ed8fe217b41b0412e098b52fdc80751089058f42bcf550a2b5ccd614a6f2";
+ sha512 = "2d69bf8217fba68ee5ef386c34ddbcf5eb7a7be7e13b5a975c99817a0ee4d9b297ec7a9bd1c2a660c14b8734f909660bd7f8af65812f78aafb73630c7927e727";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "d37a0a5ee7f9f03ff3385ea1ffe886949d63ae52b2e8e0bf1c49192edf725686be73f63fa9f528a5d4911401927777488dd1b490be36d21b541b5b71850a05b3";
+ sha512 = "b59664f5b599d719b9748de8dea1f4a70d4f2d37f22a7dbc8f2ea09ca0f56fd130c25d44b8bdecbcdbb93d5f531bf91afc06842734de5ecdf03b4ba670d542cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "8af83b0c3c498dc157986598d5b5559944089bc27e62b832cf16937be1a3aa7888731fd16bc8a4400c49be012cf217404aff865e8cc8996959b594aa55becff9";
+ sha512 = "18a3069d101488c682f134be7797877e5bc80817073e26d7d1693c3b161224aa90105f6aba84bb2a8841a8859b7b72b19e2260ba36924baee3c8c8a83898121b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "7ae083c02e5a98bda3d74c6f3c8269bd668b6985c411b5deda5b1618c34721650c881ed32987ab369d7b730c9ab4db38f0d7047c23ed8f513a0ab9cfa8a1ae41";
+ sha512 = "945df8ffb124f39b592e70adc94b79fab92704e1fa02e15316a6e8a765a93d660dd6aaba6f5d3359fbb2cbfc61f256da5d17091d77762969fe6de873201a1228";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "281132f7cf22eae25ee953794d6a26f9cf574e8a794d8a9e1e85359fd5e3ea9ce9d74b961babbb0e91bf0bf4dd29bd49cbcc177c5ed80bdbbf8418ef8e837969";
+ sha512 = "c06dc5969ed6a3663e2b865579ac69300a654300f01bddc384bf6528105077c2899a625bb304673f94d4243152fad34254493a992d880740f556fc6b538898c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "0ab406c65017d67a05759145305816a05f802c7d71e445abe1b0e91385a1edfdebd2991aec7ed808ab2eb006112c5967dddbcca6e46cd7055caf4b7328d2fb0d";
+ sha512 = "d9e9ee4bebdd16886eaa6a3c2d31b0efd31b72058c6616d0a3dbf3b7b15987ada3479584ae626c31543a1ce1fb5aaf8a557fe095e5d3a753eec28b617b339e77";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "e85ec9f241bd282d9803b3d2bd56f96ee54605c64a0cc458861baf8006080f1e9765069368aa7315e800a3d67ece1a07f0d97d7d8ffa2386de7c6c4f284cf214";
+ sha512 = "a9d0795bc6486c694b0b8c01025112d94fa6eea436bbaf4fe31877b090346ed87ab9708453e2543c6f85bf92399326a182d5b2d3fc619a51bd9ce15fe11e1f7d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "208161f8ef28da94564f2ee317dccd8a142770e1656b748737b4d3a474713b683a49c9071515c0ee8de1dd20609a2c72cfbf9ebbadb88aa4a024b74db79479c7";
+ sha512 = "6fc6c26e0b95660c14d55b60c42f60421a8c534efbf2a2427814783aecd2580709cac4224766212afbf224011d60c7c1a6d4e62e8811640c0709124a5417763a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "4a847c0e6230a3f48363e327adb8b940a7bbc266cec09dc007ad1357be1a219ea0870dbabe227a3771048396bfbfe41114b9109a3de6a69f52dbbf959bf7d428";
+ sha512 = "13053c9b91cfe8aefdf5ddff59fda4056522c1c5ba2da0a6ca9f0de561395191b67b62603588aee3b79a1c3ddfb8a71b1f0a84f8e6dbc8f4373d91ac63b54cda";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "c5a95e4bbec779e250d8cf4ded6623a99fa8088ab67b2d645287249c097e5e645d51524fdf79de408df5c2136efae8718f01c028d15a94991ad87c2ed6469ceb";
+ sha512 = "e6be34e40dfea1424e4a164f7d1c61fb4f4c358e9e5f8fdbe7debb554178b46e8e7cefa4815819693afd5c0756762802f3952303df5d38159a0c302bbaca77f4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "2dc7893b667b8c381c242190a55fee072a911f3f4f11c80983de84b5a9533bad67b05bb4e42a2a5ca12de751703ddccb2be22226ec66919b9125f1df05d0bf05";
+ sha512 = "5b086e89b6fabd55f11dd4a3e8ddbe935418e28c5bf14a24039f43abe5c2816099d8ecc018a7b555ffb70e8b5d88aff847e700521ab357cde56aad569758f687";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "9c4667dfb88881dac477df7a87d351ff26b6cb4640f0a92332f5c62dd88efeebce6840fa8ac4d931d8ec17ebb75ace57e1129cab5fd06a65d2e84218bf6a5118";
+ sha512 = "1e224d5ed0f709576468db21c0ec82e15099a90392529dd5229af5f6efba52748ae17dd11a46abd0637b3e063962322ca2684a866b3fd73358f72a8440f302ab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "9b68ddfa1049e6a533a070a07672c160e5199e26552242cdfbb8954f649ded4372396071b302ab359ee6010fd912b590d39e1f1f8971d73c805e6db8ae194952";
+ sha512 = "a7b74f1a940fd945d42e4ba670d0ba2c4b33470ced5e1bdb71eafa7caa580ebe9b19a44455f5b7ac2b74a994318eb0b3ab038c9f3246a1f6979dbe225fdbf0fa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "fab38c25d1c35bba77fcef1caf4cabade57d9735d3c09decd824bc9c9982846c0790d279ef3915a7255df86db2129a41db22a2bdcfe98a55c5589e4554d63d5a";
+ sha512 = "3ab39e8011d7996582318daa9fc3eb89c3cb099f344bf1af7e045e1cb82d063e547029939c6afa3c212add6944e05687557063a34d1ae1675615f96734c0ebc9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "160940c8771a376e2cb2e22bce0a3a5bd9619328c1b2d8596a222414e5962805d8c8e343bb0b969114eaf0218e4e1830470b813bc68972f814097de2fbba56a6";
+ sha512 = "e7325bedf5f0bcdaf6710ed4a46333321f3493c1dd7c6ba5d10a5b978bd5bfc4745872d817555e2767758f861429872c0628d9158bdc9923b5eb09f497b4d85f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "519438cbb8fed811428060f0e94196a276fcf6fd02bdb4359098b4a9c33635f4d0022ccc6557976672ac39d4097425af91c07789a443e978fd84c1237e8b034a";
+ sha512 = "20c7f71ec371ae8e3798a46ca3b7b0fe8f449d761c033f4e731283652027193a636b01a37cb9020180e423ccb7a6b888f9c42e415be84117c9e18666b8476434";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "defcb3c8039228e9c6d64338d9e2c4eb39e87078d0f66b98c229f9f2205516be97fec53b50f18406ab6a14edd06afa6197ba62cc31612b48196b39f5babf99a1";
+ sha512 = "2085656a737f129f0db8e8479a818138e516f378c93cd3ac2af0005907f3e5b969a4c76b2a94cadfd3bcde062c9496910a81f2866987876d60a9393132e4567d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "d02c656de8c92f3d8bcbb07ed17308c5753ba08905eca36a4d081fe18fde86443f7a4de939b39feb57def17aca7782756c4a264816ad6fd092252331bab958bf";
+ sha512 = "be8b9b06dfa34ddb73cb7a7903f9b010ce133c531839f10be360e3826077143600b9ff0b4ddb9e48bcca72a3ad5a299ef12751701113073e2f0b4765b5d56a6d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "89f1e0b0f908ca0a6238e76895d4f8e70008d987e20b64accc91efb0a9024de0d739d7bb34d608e4b125324e19e93dd044490992bb26a1a25cad1c83d4ebc19c";
+ sha512 = "fe0bfc1fb17d83c3636860acd2cbdf0281902de1e272f0fd2f6ee9c16e4972e697e219a5e94609919dd070171bf935955097a8332846ccf8f6ff605297c735e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "7d3724d3e824ba80e5342049a1e1cdb2754f25b8c85f2135ae782000dd11caded9afd760533371b46cf2dc30dac0d396fb5c4223100c130c2e390d12ce77fc48";
+ sha512 = "673dc827b03735844db037f8a40e82b14c7947cfdc8a3a0a7baa206c1c5a16a7984459dadfb94a9b86b8d5737aea5f904e0db1bee7b2041b55eba3b6144b7002";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "1ad110a807b0e823d3d99350c72a92c0bb81724faf32587d0809f040a29317bb3286139be6652a74efeca4e1e461d98c36d5cba93d18abf98fef9634e7724ec6";
+ sha512 = "a5f3ed796ccd1b28b1a383372815e9ee31589de60095a010199348051310651abe0a1d54a38daa76409a6c23fc82bfe52330287d1996413d919786a4852123ef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "cfca9987511af0185cdc5594681807af1a6519443c225942c68b3b53f0424ff0cb6173b0686164b681aca08f8d93f81499f6d15dc18ad729c762d8344dd76c12";
+ sha512 = "2a43984e243576915335df43bc8dfae37ea5243d31e8a8a60ffe74bccd58919bb0c544a89d7b7cbec72aebb378d64db5d9da3a8a237ed490f6c1efaaf2a926de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "28f18f8c402b41e4145988f93939b329efbe447ebc332ee88b32c3071a786a7bd68aa8be8e6f85073026fe1ff56c09d7c366efc9c155b6bb9edd2d84d36467f9";
+ sha512 = "b95c3518c71bbba3d60dc90187b0255619776f85c326d1349cd9d08ebb16139c2e21944c4c581044e8550fb2ca35643ed109abce0f2428db56d36514ab3482ef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "a8e45a24c09a0285daf2029a4a483c4d2067acb622aad1be2213a4f5f7ecbe6c1f3ec2095edb15060bd37d3c009cab222fa21e0555a93dc2bd1dd6cfdff54e40";
+ sha512 = "2352149bc1d680b86576f95faa26efde328132f37a8f5dd6fbde24b339439548d263c0e84995260b25a785456424ac424aabb78378d2c341e2d66ab06579e720";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "9414106287db53abf4a57a0e3396a6dc03ebb8f4b5655d23cae019ffda804d8121544d843931082a21969846ac8d13f0f726c275c15ccc84fd7cf7e8c5e3fef9";
+ sha512 = "2de0df8440195e085f11ebdc8ba0cd55983045227fb0c9af15b7edbeb2f8a912970ec392ab4773753b5489c37e7fdf580899e5886679c7ca11301fc56e6a283f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "5b971598c8b2c89150ddd563d9e2001816a4283288f34814abcd8a96520f09c35f9f07068145010f8091496fda33b5200a4ce95be0804d2debd9b34c2ac71a2e";
+ sha512 = "a35c8fca1a0e9e17f4445478700e0e04d6ef46e528c6b1a9bf7f5cb97f5b0d2344a1b93c8871726a592225835b85506aa1e02598515a02d077e403b0a4d817e3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "7d8ce6ee5d6bc6847481c13ddd1f1002dd7cb6464d5669eea629808bd3d1cd1c28dd653119bdbc131c59588d4c92c1172f7d926a07ded78f8aebc28beb8f0053";
+ sha512 = "7db8e1304ff41616ff152d87850968339e8699720d4dca156acb9d15af72d4e947d36e0363fc258197ff2b6e3c11651b0b75e6404bbef65d673289a407cc11ea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "73d581fcda9b9e8a6a97402f0b9a42245e015b20feea2428000c05fe10a255a7345bbbc8ef6f83097500dd7910e21928175911bccb12a5b841a651ffe0bb77af";
+ sha512 = "d171281af80764d6b9d7f1a31836ce5136a1f75cbd299e02801937d8eace6bf4d452cecae0a0010582c39920e4592a499ec856d2b208fba61bf3b8c169e22389";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "3f84f4d13b2f474252de73ea7940a70bc2da1d27e3b560c3f448493e1c5b10277a508848ceff8f2bee0fe11ef2196974033a88242b93cb0cd4c34c16996b653a";
+ sha512 = "f49d7703230f981b821d504395158ec3ee291614070d6aed0215c096eef8fba7aa44ee74c8342e75b80f1bf701699d9a4f17a34d5f0e7d846b7cb126de32a4e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "4a667161aebf1b3888b0e78187d5de9030aba10f1fc90c74960104c38eb1d4474e2109b59e1eb2f4a41309833d0fc6c3c6e0dbda5d2c3428875cac6dec7178e8";
+ sha512 = "a4363b39fdf2932c618a56f14405963d9240e331ec2a26e72c47cb7cf12a510b03b078cbcc73f5376d8e5be0e64444de2f9bea954806bddc9559da86dcce37d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "a3efa1a6335c7ba1ba7615f90fce09ca508bc1de4e1483cc26f28c0781c215f71dc119a4fa1df0b17cea62c47ada4e75482e45f359bbcafb5d48b11f8acae7e1";
+ sha512 = "65c5e07098ee6016f81d3ef9666aafcf2e6ae0fa16acc1f0d2d58b07f0da84189b9b297667e352d9a4dab06d0b9ee2ec6778151d2e4d320bfb7291e9004b27dd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "f5186a99d31215c07ec6533956b52f263ee6c50cac8421eba039b9a5ffdc431efc075bc9f7cd0cad950e56b9a574f6ae47ddd79f1135e82b602d8bc2ad43e4d9";
+ sha512 = "145a31f95c54186dd52ccdde90ad24a12246a3949411756ae8c7b86fa20e3919dd6a6a32cd16f23ea607f2245ceabbe6588bb7345ce056a45e123bf2300a244c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "4c0103edb3041f5b3dd4af8c7a24ef87d372d64cea923f1e911a5ac565c89d734f30d8e17df2a457868e67d470c8609e2e60729974f37fc17c0ffc08ca676c88";
+ sha512 = "e9ca61c38b46819b79ff1f3c4c333f3ca7939de2f029bfafcdae6c154f209ac65f9407f3e0945ce6e49ba415b2d53c8c03f4eb81b735501e4349557b5558871e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "f00b933c155199ee59639f2e8f790d5995c48b3ff9280f3cfd2a968960e64fedd8bc8a6f90f023898ba966f4a91bd6ef6692e5d66d117f8fb828d08ed4536d4c";
+ sha512 = "6496ca8078d7e7137caa8274df1f51765178d0f39d7cdcc1667193b0cce3f9c514d00183b15a0c278f7cd4c32ac9933b6e11b2bf5e806aa0ef5cb88487b3e4e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "188e79610192fa583ad20b1db294079187ed8e7ee9bb1e488bb62c3ea3da6a7607876cbfa14158f2f8f39963f18e52d5926b95dd9e0228aa7969e24367b75d9b";
+ sha512 = "9271078fd3eaa61538659f3e7bb068c87acbac807b14424c5b56085801593e77dafd15340f814f3674c644f76cb42c9289f9d464d7dc596d58a656a2e8d871e1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "e14b97d251e1ba190375e8e6a29483515f123b9527963c7c90df6d54a022bde02b4f1d6df1c8ed77c427d01ce81e13132e6c178b5f5035bd4e7ac9c5f5bea6c3";
+ sha512 = "8b7ea0b40195ec541acf60cf4fa5d89c62d4afb04d3f2e569acf8920bf89b89b4cf30f9af45c3faabd76f7aae89a09d9530f16108e66fc2748c934ea459aff63";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "7ebe6f342e189dc2ef50e9e0a5672acf30169ea28b080df0106e25fb43ee6916a8bc7cf395f4c16c060672d27e53e551d938eef448adf4d36110a045c0b87094";
+ sha512 = "ec41baa1cb3a4b543a5a961f6c54c6ed62e16888b0073a93bead75baa4cb836eb05aa90b02ee09911f31c9b106945bc62051edc3f681ad6d8dce33dca918b8bc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "277c44da1ae25755970483abf6eea4303898feb9f0dda099d5245f6b24ed638a565a616515521fc565153504fe86c4d832a780c1799569d4764c7f9ace9cfcb0";
+ sha512 = "9b2b6c3b6ebd7b43e86ac000d7ef0c5b9f1225b01f41bd17fb3293b7a89df8f34858bea5aa4370c25b0d15757acd701b1844c3ecf7ea6b38ac28fe701cdc5866";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "41b351181cc9ca4a77b1ce3d33c27a2e89fdbb8a6132c231cc17959c61b8295503e09e8f828a458f47df49c52166680c07d34a07460daec82b0897b5b6abcbc6";
+ sha512 = "9afddbc1e372b7f41790ff84f43770c6a48d23165ee56d540f0ae624fd563b0a9bfe18872ff668113a7c2ef66314c6bfe36ecddce45ba7411817c4d574fcdde9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "40242adb26067a9502876399c2e1b53c170c7f8b0accbe03e85ecc69f9ba9d377f643d54386184e0f7a612417e45586949c5c47c93cf0e192b5f81adcf391ba3";
+ sha512 = "fdd56e2934767f5656027bf7995d91293bd1be5bc6d5948538cabbd3976dec220d4d54fcb94bc9b6246d1e10c50015c7ba20846010aa9767fd120645a37c0887";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "3880d95e5e5fdc1da8e36c58ce16350f9a3eaee4e6d400370b375c4ed77e1eaec950acd483de560dc66634cf0931bcc83b3454c89575029197402be18976cf2e";
+ sha512 = "9b59b35cc8bdf6eb3980c3ca9bd313ba7584e6c24eec4521d2ac3a4acaafd2b1f7aab1bdeea4c2219bb9c45e04c56de1d669245649a309fb422903db0f73d266";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "6bfa9b6569d188f8544cfcb7d20e17f1a2827e5bf10db63fe2b10e64c1993df2f7026a957fbd9df5815ffda67698a095253ae623d20d2dd0db4e9cee9329dad2";
+ sha512 = "e49c4440031487d74406f62d8028202839f0ae314a6264beecf86db736589cc6f0a9c3afa73644325f5a2befcb6403719b5bfdbd94d46489f06b45a2e20336d9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "c8cedf4026472dfe887bdafdd15ef6cf1593bcbb1121ffb8dac5ab5d6ef230c463a8afc36df408ef81f5a3dedcef8367bd8a07deb0c6fb47f34f89f34553affc";
+ sha512 = "029492263010205a78b17652dd3c668acca99bc15ba9f420bf5f8a3109a1f7b6fc654c9be866a16ecfb95c612c3161e019d6924f1737a180f670bf32f9888d94";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "c903182cdf3cfd403304e47dc28603749fdf760e4a1b18b23a7723fee73d3c6835390bc868ecd445abaf3267bb69c188499f52c27942a63147b99068a1ec80da";
+ sha512 = "8d376091e155bb9675a83cb828f07f7e6b6d778a10937f83bdd4109b1e61b89fdc28dc5742a006515a8d8830a5bdcee070abacb9b857e8c084cef6a26312f8e2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "56b586ba243bf31499504e38f4025b3ca760a409c8b9d6c9edce120ce92eb697fe2b00fb69552dde0937174e8ae90c19d3cb1671bc91a38a0c9a930137c1c954";
+ sha512 = "891093ad33a07775b91d3a62eeb10be4b83771fcd44076588aa6c5821135ae14ac4577d5f1b9c26b5c7e1803c50d642cd473ad7676f935895392f2956b724ec9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "9f3e97f154553e6969dce0403e05305da31e3363ce84dddd48bf5156ec2c86e7ee2ff2ceab3400e4c7cf0820318b981cd01383a77402f2856dae44b42138c52e";
+ sha512 = "a6e21d9ecbc563830afa618bb24201b13da61b028aa35c594ff387bfab5931b4d907076fad2c9dd70211dbd19c4f8aceaefbab5e9f4fd32188ec1f0231cdb427";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "ed3c06e17d2ff131b45ba66c66834b69f733356a7c95a1bc6f1c4f8f987dbff1dc1aabc2439bcd01e6d6a27f45919584a09fbd2fe61563008870e90f9dc3d970";
+ sha512 = "c7e1e410264837aff25f994cc1642ee7f3c5a45a4ae6f6c353b6506fe982abbb6eea2d6407337d83c9d0126d9debb78e08d8a7d2740a52cda1dd47e4a62be0fc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "2c14e0ce6ffd02722e9d41492b1dbc9a5af909a49199a685733a351b1f3638702a9234c6ce35c5bf25dcb2c3155d7496c10fd6d38b45cdb5ea7fe066176378ac";
+ sha512 = "4615e472d4acf1e3af2dc2a4cbfb289ca7a369adb47db898be8aa12bbcd2eda39d627c729314172c10da938113148be271a4c77a9f5c95a771f32ca7a107b78b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "23f6e5eae45c273efdf7f4758a56e5883e3063cfb2ee223ca775149a8dffdb9fb614e5ccc22be07e7d6ff3ec83534adcf6511131c6a4b2464ac02c520fe0dcc1";
+ sha512 = "93a19678ae8699493e9500bc2d2398beb6a10b725a127098a5754dda592cb6484988ab34bef7b2f4b62a12abcae9a3d58d50f47926533cf8bcd080aee6a82464";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "f0589827713b4466ad07dcdb7d289f5b7ffec184b8f259ebf6718deddd242a8269301b13974360c5e10a4dc96eb17bcb3255e1c4f10fabe8e8cbb66e8557d8ae";
+ sha512 = "6a866798a4a90883010bf62ef153f192b8a83af0e4ddca34d06d1dbe5f7111b042a02993c2d18a2a34f54a66d944130b4a7f9a3d37a28794653cb794ee106af3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "de31966866491c5a91be0bfa8fec3f0c5bbf6add028caeafdf1f7479e7e37f20d58e7988facefaf40ff9e524dda554db8f425821a2cc056a0eab1b19e8cc2773";
+ sha512 = "0afb2a0652fad855227235e40edeaf78046a47cb18033bedd895baf0c7766ef3837cc3273e92298814b8cf02240298a08ac489cdf3867a07a3b6c40ef826fb8a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "1d9c1fbb917315a22a28fc6fbfc9813a6e2cfc66bc774f20128c2b4949c5c96425e74f26f0872ab91858e339af70e5f3c0dea73aa01f2491d757bbab9d5ba434";
+ sha512 = "802a49e37f62924a20076e0a24357d6f695ebbd75b82d7e292d91cf01436ae644b08dea289a344499238183d0a70ecf0407c37f89369c2f4cbf75f015584fc7b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "f3639b1bd361d86f2b134de404319ef6fab9f44d7150e8070a5fa2ea2e8cfea708a7426781ec4e177f4ba4355815f0e7c55479fea2e9e4a7ace4c53cd90005ad";
+ sha512 = "eb689a073634f18ff9397bf2d43b870a314fb630304f76758d8683a5e16670877f87c2b56ff35c2534904744fa546b70eecc1ec88b2ebd6e3f577ecdebedaec0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "4e4a678741561a2268292643563688cdaf15e188190bbf760952ea7c566f410092347800537cb7b80753a474e031e9066365d162d21225e8257440412e99f9ce";
+ sha512 = "91d00cba89b26c0d3d9cc5670d3a876194cdf545c9fe96b6afd1087296f1c9b9840dd020b39384a0de7135069ca473001d85c51b6c5ec12d5d0719d116d28e87";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "f4525312cbbe3048f1d671517f552739a5ceacb52b672e212848a13ffdbf736ab475adadf1cca02a26068ad0a9edc0dab5e6dba19c1831647be16781a56390b2";
+ sha512 = "48c3b0658763328c6ad16097a1eae37117dcca6e2484a42eb3e4b6fa1f3ff687ecf820c64cde0ec7bc4e2e860a7574ed5066422ce894fe538b1788e4827d7927";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "fbcd1297fe658b0743a5a791a05204e4bb7f4951a3250f494e48daf8da31432ba56de05232e68f6d3a0f6cdc4a7cf205a0088d56cb3fe08add03a27b05770a92";
+ sha512 = "0470149a2f1ac7125069fdd537e89b81761b61a3de8b5392e85c9a8e57a7aec9bec65d5c58f3087dd54fffee09a52de6ba59a5c52d41d33c333c9bb577169614";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "2dd10ff59acf1f362405842913eb14490d40947bef3ca2a793813ab99fe3d908dcb5cef5dfa2854399b37f11aa4cb3025383a73dad0c95e008122f87d73e5787";
+ sha512 = "b1fd71af6a370750ea69ab1468bfdd15fa5735c767ed46365e3ab786ebda0cdb8475bbf1e46328cf26123f191ee428298fd609e1b848df7f0ef2625f8dc5755f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "50d5283440925c946088f97e779b84070c7ac4f8710c43aad42ad85879446ef8b9d4e070299cb64b35435421db8b1b4b1848b43e8aa1e3b88be453d4c84c0a9f";
+ sha512 = "5f06388ba94f7dc497c97870bdb48be8873b4623f95f858ddcfd3160e7476cf04f15b7226822429031b4c31bffb52e807f9f3fbe5d3edeff4cb82ed3384002a9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "51a561e1aff7c3f9d80a8da2343c168d7d12130d94b77c4a4f8ef5daba928082e3668bd87c7502877443d6f5d51e7e03ae8c2a993e91806048ccc40b59e4ef31";
+ sha512 = "ce6e73c840210560cc1bb6006ba69031daddc59f0cc89a652fbda7dad4cf39165f474e9b4601baafa1e6622e78a1fb37411f611e21221c7f7e059e42bfbcc4fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "837d627728c6ae2f1f717c379505a5f2d9b709368448c8344d156da6c9e87282f9821655ecbf4d4639d81c310777e29043126c01d4196a31358456d31489714b";
+ sha512 = "3c906e720fd30682cfe17cafc668e2e058cd42c2a76dde01bfd7162afca4dd777d108099a79c16dd46f35818c4c6a3f5bbcfec2c1ff8efc374ca9b2036b22a63";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "f783fd68377303a315e8ca4ca971c7a302d4e1c62b7e3a289ded882ed972156131bf2a48ed7b904ebacef64e44f9dd6d14608b9edb90726a4081e241881d301e";
+ sha512 = "f166737666fde11631a28d521ecfdc6b159694a88c59f78f87d5b304a5a6b83c614dab05357520f6cd92a33a8d390dbc86d15f7f980c6a81646f6fba7e0e9cd1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "df0be20c8dbf5cb352c20ebeef479bc1a9bc4f60bb8b54b4d81bf0e1dbcc83dcbfdfad5cedb42713ebba888860639a8e3669cc2c159254fee3885d07f8cb1625";
+ sha512 = "eea5028452c79c93334a43596a145422df3371b8aae90af7f6e65f013c845398a780367d1a3a8e9c2709d506b9f0349fd42ccc93d3e24ab44fcb4677be68be65";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "bedb4e28f62ecd75fc93af2c8ccfadec755ec500a5aedd0a8136f69c23e39c5cb64ea509e9b3551453754a3feae7dd123564aadf8dc13e9179c199177b82be5a";
+ sha512 = "a81cfed25b0c89f33419b7ad6aeef1dab4896deb9e04293bd4224c6c8fa6a9ac3e1c5aea027d2785a6cb537f5d18077a436afbf95ae79c3843744a219d49f017";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "02bac6fcb481ae02feff97ae7f83fbadb170e9ae133ee4f557882e004c21707f82e5e4db24ea6d67170f4ed88f7f0a271292eefb98853b0f96b0c894f88abd27";
+ sha512 = "e19b775d7bdcfbcb7bbcc43235dbaf6401628fdf6c008cfcec34b3095ebe5a71912645301034d7f941146b298fdb57262a9cdf7e28208302c82909e4665aa210";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "d4669ddfb2675b3cd47a617e122079546ee4a35cb10ffc69ccaea76e3108155f3e209b2654744de356f68d789394a82b12b4a0c1ef54c358441e0887c584911f";
+ sha512 = "a183a3a9fcb3611f3f07ef2f5051c50f8ca32b41c629afc9f0176ebd18b88155b2cf3e67fe201aba02efb11ffab24fc8fba603de619a0a8f2815605eba1b2e83";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "7e58faa6d6a72d0a750d9a5375931a69b82ddb0ed1ed28c154d93accb3f8db2f0b4416de18352e36b4d5182b634ba1ffabd44fe6a89905f06755288c5c3361c9";
+ sha512 = "f3dd8256b8a71fcac09b776b43496c7a4c862a5a86612235012c9b70e0b1a80001aaea187c45a6e1e43ed2b6a445311b7f3d52b579a048e4e122b24dc30a760a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "f4472e1cdc43a1a9d36d06306bd12259f3d63f6282c0ab51787d33af58546554442de80064775f4f55e37a3b492c33a6ca41acadadc85d4036b874d001a9f49d";
+ sha512 = "0c45580a4029119cc5e7318a83f04de4275add2d105acc360ae8045ce0b0042204f6b07389a6300571bd9cccef3eac782eefee6b8af06e7c8b10a5551c4ac97a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "3e3d4b7eba47980b83e9abaae4d59afbb879273e55c942e8320c22a67fec924744cdec93e679c4d789596fd3227695865d446a8604580f18b3125c88f50f26e5";
+ sha512 = "f2ac8a3440456f0daccec3f4a4f45119bdcb6fad29e931bef8a69f6fb864ecca0e77d3f6bee10600688e9cab3ae2bae91a9dee51d8c398df5d102e56e4e15722";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "4670270b2fb252c9fd75cb22e79c68ece97e6bafcbb042eed842b12fff2d7224042b273c1106390a0f2ec4a246923877cda50c93313be2aa736a54f0ba127c21";
+ sha512 = "82ecb371e5b612638d4bfcf0fc42454a7a1a01bc6a291fca06a96ae3e28c70b2a37b2504cd340941f74fb7ab44a7a8d11219d313b78dc9a4923128b9fc4e8060";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "30e7f709d3c9efd5f559082b00222dc6cb1b3e8376e977239bb5d76d9793092729d49255599e537c86fe615eb0713ca8c3f9a36a78c6d41ab1bc676ba46cc9b9";
+ sha512 = "6e04d05d8c7fdbe6c118f71b1ec1cb7eee698b980c70832885541cc89f9b794c2d8d273f2b9c55bd4b57f7fed53390c0dec6bcfc0545d60541ada4ca52c879b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "313a8d22b9870ee916a571a9d591517ecc162c8d37fea2d3efce4e839bb0dfd5ba3f960796b3e2279f1c115d68296d31bb05434fdd2335164c0c211dc2a1638d";
+ sha512 = "10cd65336a77f30b04ea9f9b12e48ed103b66edb187909ad7ae7636b7f8f4cf86aaa96838fc60bb24731ea4ce539a8de1787c3d3f24325c7a93c8269a7045e83";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "4cf19ea59dd841de4494f4d458075ce42d9d97471215b7ba2f7a84eec79d1258c5cd341ee013ddc422e060f1aef902dc93216aac15aad04c9b28466feaed89af";
+ sha512 = "c56b853b0256ffeb75595755cd0c71e847958cd3e7c753231399e89739b90396effa6ab80016143b18fb49940945ee724ba7f6da2a891c06e26854c02ea7b25e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "cf873be3f9d72655093719937242a69f0b0644396e3332fabec20eb696a1310f88481b2f412ab45835c5ebf40821b298ba2371b20db101621710d7f522e19cfd";
+ sha512 = "2248c67eadfea27633b2fa60506964adf965c4be82948476bc89c4f7665bbd174bc157e925502fb7ff95e15f6a51e732620a7323f2c498e20c918382c6befde4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "598d4308933d01459cecb91e3edd2bd428a70d7f40905f03e04009ab0f890537310b8ad93393340937e7eccce2d78ef15915530ef2f27dff46885f95b23d702a";
+ sha512 = "4a33814d0c9cc3be0b589ba4a6755b640804d3bece452acc2d482d4896197822066be77c2eee9cd7cc5d58f00df9d2a97b47db05e4b1c2e1695a02d20ead593f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "b5099c35b12c6ce96ee04b49c0b8e38b6304274ecaec1897008cf74af1809fb0a3deb5acd4a5cdfb27d949ba06a669d3eae450b59721afe9441aedb8c6728822";
+ sha512 = "49361995ba6358733fb9c51780ed1d31e921ed0e3ed27c8e777575c93e723702aa0e47f6ed80ef282b28d5588029ce850a3dd9118a047867466acbc661f6fb1d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "f1f5435ddc19aa2ea3199982a2eb83cff78f016473837e375ab0ab9b3985ea7f727c9b5a94137a76c08c3c1fe4af0d8f127b479d4bb9778bdc807cb46147dd87";
+ sha512 = "74b6a3ba8c19acb2dfd2c9f2590dbcebd832f8f1fc06fb805bc7c9ab008e0cf8bbb4a829ce87d807193d8be124c04cf6bfcbd786fa7af1e6d86e20aa8e81f8c9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "019a84aa64fc11eb0266d33f67e19623f75960f5272a4b46ce9985349a15a4e16be7c84f3bd7293617cd4c778d62ec8d745b99ee707fee30f3a3627717793587";
+ sha512 = "08ae1db8130aa6112df406e622c27b96758b825e55e988c81e0dbb746691ce69cea4305a88851399a8c988d386702ed968a512d2f763e3452c7ec48c8d832c7f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "32ffe1615af1522970a00608a4689360ca21d51b3003d2ab41cf317a27043c72db483ad427af982925034c40cd84684c973d4faaba81ea503cd28503afb6055e";
+ sha512 = "20bcb0b9986d0360868b8fd8ab3925e2ea031814944255938bb81f57a21881fccfb0f4648bbe689b8828fa8283c7d56c028533770dfe66a4fc11a7d0240afe2d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "bc88e7f0cf213377d77a3d8ba2b7a391a57c69ea1ed8c5253da5191cd0742b97b0de1566c971d5a9870156cd98af9e3c8ad9a1b175e1079e7a023f002a72af20";
+ sha512 = "ebb6f05a771b155e43a88b8dcd25d1a77d254900b7eeab8d9a7284a616268f9c7718c4fb6febdf5cbe697407842f3c4d820a057b66d7b6ff7977f66385360004";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "1c2c9177fdb47271b7388e9cb445de61e2e21739a558788f0012c3ab8f9da5a64fc5d833ce4f8d8a7326807daa3147420b88d8d78aeecc827a8596adfcd60b0a";
+ sha512 = "16c75f1d64ed123752d7c28fd637749fb74f533a809f9b07d4f64dac3dbd1b2cc4141e4639f6f0b57d4e639c5214647ec68c759f2811a2613b54491d83ef0eb2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "5d7066183b5f8dd41f00fe89f5423109d6d1a8df6d51934c49e2c50c627fe3492294ba992a92d1f07b0ca96811a0d27842418b416618d059981a8dff21452391";
+ sha512 = "99b91025c160cd024b0954249efa7f1f17f8f327185ae77930bb5ecdae741487532e2a3b8a3e34ae3117e3f9c00faab0d3fd29e9f62c94e1d4e48bde6fbe8894";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 6c6e05133bd..54b588fb097 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
{
- version = "62.0.3";
+ version = "63.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917";
+ sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df";
+ sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3";
+ sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd";
+ sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495";
+ sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b";
+ sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919";
+ sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373";
+ sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba";
+ sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375";
+ sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80";
+ sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80";
+ sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f";
+ sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775";
+ sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736";
+ sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a";
+ sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6";
+ sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691";
+ sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6";
+ sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9";
+ sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1";
+ sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979";
+ sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed";
+ sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395";
+ sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a";
+ sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665";
+ sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58";
+ sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2";
+ sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b";
+ sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1";
+ sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27";
+ sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e";
+ sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab";
+ sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b";
+ sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74";
+ sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011";
+ sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6";
+ sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0";
+ sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d";
+ sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e";
+ sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3";
+ sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69";
+ sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219";
+ sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa";
+ sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a";
+ sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d";
+ sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97";
+ sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef";
+ sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39";
+ sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a";
+ sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf";
+ sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f";
+ sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77";
+ sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58";
+ sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7";
+ sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835";
+ sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f";
+ sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40";
+ sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813";
+ sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761";
+ sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7";
+ sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae";
+ sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4";
+ sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238";
+ sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc";
+ sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4";
+ sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde";
+ sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7";
+ sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18";
+ sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b";
+ sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741";
+ sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4";
+ sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8";
+ sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544";
+ sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601";
+ sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0";
+ sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003";
+ sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee";
+ sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa";
+ sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c";
+ sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538";
+ sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921";
+ sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0";
+ sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8";
+ sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f";
+ sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6";
+ sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f";
+ sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab";
+ sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1";
+ sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843";
+ sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029";
+ sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac";
+ sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10";
+ sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9";
+ sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46";
+ sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524";
+ sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888";
+ sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540";
+ sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974";
+ sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414";
+ sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751";
+ sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be";
+ sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89";
+ sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33";
+ sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e";
+ sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895";
+ sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63";
+ sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d";
+ sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1";
+ sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e";
+ sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891";
+ sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce";
+ sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611";
+ sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a";
+ sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7";
+ sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97";
+ sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1";
+ sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a";
+ sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71";
+ sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a";
+ sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516";
+ sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599";
+ sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4";
+ sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f";
+ sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33";
+ sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9";
+ sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e";
+ sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308";
+ sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688";
+ sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab";
+ sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89";
+ sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57";
+ sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5";
+ sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6";
+ sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948";
+ sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6";
+ sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f";
+ sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629";
+ sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87";
+ sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325";
+ sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd";
+ sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238";
+ sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2";
+ sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651";
+ sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c";
+ sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717";
+ sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649";
+ sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f";
+ sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530";
+ sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf";
+ sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261";
+ sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24";
+ sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049";
+ sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790";
+ sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5";
+ sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073";
+ sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4";
+ sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb";
+ sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b";
+ sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb";
+ sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224";
+ sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419";
+ sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00";
+ sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7";
+ sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb";
+ sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f";
+ sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf";
+ sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56";
+ sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9";
+ sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac";
+ sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4";
+ sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6";
+ sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707";
+ sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110";
+ sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54";
+ sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2";
+ sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975";
+ sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee";
+ sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9";
+ sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829";
+ sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b";
+ sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676";
+ sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914";
+ sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d";
+ sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04";
+ sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773";
+ sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618";
+ sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae";
+ sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f";
+ sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b";
+ sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22";
+ sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef";
+ sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9";
+ sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230";
+ sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb";
+ sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7";
+ sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471";
+ sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1";
+ sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index bfdb5fcc010..16c9b548325 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,7 +1,7 @@
-{ pname, version, updateScript ? null
-, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? []
-, overrides ? {}, extraNativeBuildInputs ? [], meta
-, isTorBrowserLike ? false }:
+{ pname, ffversion, meta, updateScript ? null
+, src, unpackPhase ? null, patches ? []
+, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? []
+, isTorBrowserLike ? false, tbversion ? null }:
{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
@@ -10,6 +10,7 @@
, hunspell, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
+, rust-cbindgen, nodejs
, debugBuild ? false
### optionals
@@ -19,7 +20,7 @@
, alsaSupport ? stdenv.isLinux, alsaLib
, pulseaudioSupport ? true, libpulseaudio
, ffmpegSupport ? true, gstreamer, gst-plugins-base
-, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
+, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, gssSupport ? true, kerberos
## privacy-related options
@@ -31,7 +32,7 @@
# webrtcSupport breaks the aarch64 build on version >= 60.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
-, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport)
+, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport)
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
@@ -80,23 +81,24 @@ let
browserName = if stdenv.isDarwin then "Firefox" else "firefox";
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "${pname}-unwrapped-${version}";
+ version = if !isTorBrowserLike then ffversion else tbversion;
- inherit src patches meta;
+ inherit src unpackPhase patches meta;
buildInputs = [
gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
- nspr libnotify xorg.pixman yasm libGLU_combined
+ libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc glib
]
- ++ lib.optionals (!isTorBrowserLike) [ nss ]
- ++ lib.optional (lib.versionOlder version "61") hunspell
+ ++ lib.optionals (!isTorBrowserLike) [ nspr nss ]
+ ++ lib.optional (lib.versionOlder ffversion "61") hunspell
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
@@ -106,21 +108,28 @@ stdenv.mkDerivation (rec {
AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ];
- NIX_CFLAGS_COMPILE = [ "-I${nspr.dev}/include/nspr"
- "-I${nss.dev}/include/nss"
- "-I${glib.dev}/include/gio-unix-2.0" ]
- ++ lib.optional stdenv.isDarwin [
- "-isystem ${llvmPackages.libcxx}/include/c++/v1"
- "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" ];
+ NIX_CFLAGS_COMPILE = [
+ "-I${glib.dev}/include/gio-unix-2.0"
+ ]
+ ++ lib.optionals (!isTorBrowserLike) [
+ "-I${nss.dev}/include/nss"
+ ]
+ ++ lib.optional stdenv.isDarwin [
+ "-isystem ${llvmPackages.libcxx}/include/c++/v1"
+ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
+ ];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
+ '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
+ substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
'';
nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
+ ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ extraNativeBuildInputs;
preConfigure = ''
@@ -128,14 +137,14 @@ stdenv.mkDerivation (rec {
rm -f configure
rm -f js/src/configure
rm -f .mozconfig*
- '' + (if lib.versionAtLeast version "58"
+ '' + (if lib.versionAtLeast ffversion "58"
# this will run autoconf213
then ''
configureScript="$(realpath ./mach) configure"
'' else ''
make -f client.mk configure-files
configureScript="$(realpath ./configure)"
- '') + lib.optionalString (!isTorBrowserLike && lib.versionAtLeast version "53") ''
+ '') + lib.optionalString (lib.versionAtLeast ffversion "53") ''
export MOZCONFIG=$(pwd)/mozconfig
# Set C flags for Rust's bindgen program. Unlike ordinary C
@@ -158,7 +167,7 @@ stdenv.mkDerivation (rec {
# please get your own set of keys.
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
- '' + lib.optionalString (lib.versionOlder version "58") ''
+ '' + lib.optionalString (lib.versionOlder ffversion "58") ''
cd obj-*
'';
@@ -185,37 +194,29 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=${default-toolkit}"
]
- ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks"
- ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
- ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+ ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks"
+ ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell"
+ ++ lib.optionals (lib.versionAtLeast ffversion "56" && !stdenv.hostPlatform.isi686) [
# on i686-linux: --with-libclang-path is not available in this configuration
"--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
- ++ lib.optionals (lib.versionAtLeast version "57") [
+ ++ lib.optionals (lib.versionAtLeast ffversion "57") [
"--enable-webrender=build"
]
# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
- "--with-system-nss"
"--with-system-nspr"
+ "--with-system-nss"
]
# and wants these
++ lib.optionals isTorBrowserLike ([
- "--with-tor-browser-version=${version}"
+ "--with-tor-browser-version=${tbversion}"
"--enable-signmar"
"--enable-verify-mar"
-
- # We opt out of TorBrowser's nspr because that patch is useless on
- # anything but Windows and produces zero fingerprinting
- # 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"
@@ -226,6 +227,11 @@ stdenv.mkDerivation (rec {
++ flag crashreporterSupport "crashreporter"
++ lib.optional drmSupport "--enable-eme=widevine"
+ ++ lib.optionals (lib.versionOlder ffversion "60") ([]
+ ++ flag geolocationSupport "mozril-geoloc"
+ ++ flag safeBrowsingSupport "safe-browsing"
+ )
+
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
else [ "--disable-debug" "--enable-release"
"--enable-optimize"
@@ -239,11 +245,11 @@ stdenv.mkDerivation (rec {
# top level and then run `make` in obj-*. (We can also run the
# `make` at the top level in 58, but then we would have to `cd` to
# `make install` anyway. This is ugly, but simple.)
- postConfigure = lib.optionalString (lib.versionAtLeast version "58") ''
+ postConfigure = lib.optionalString (lib.versionAtLeast ffversion "58") ''
cd obj-*
'';
- preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
+ preBuild = lib.optionalString isTorBrowserLike ''
buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
'';
@@ -302,4 +308,4 @@ stdenv.mkDerivation (rec {
inherit browserName;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
-} // overrides)
+}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 369b18d5ead..102b0de3fcc 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -2,16 +2,16 @@
let
- common = opts: callPackage (import ./common.nix opts);
+ common = opts: callPackage (import ./common.nix opts) {};
nixpkgsPatches = [
./env_var_for_system_dir.patch
];
firefox60_aarch64_skia_patch = fetchpatch {
- name = "aarch64-skia.patch";
- url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
- sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
+ name = "aarch64-skia.patch";
+ url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
+ sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
};
in
@@ -20,10 +20,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "62.0.3";
+ ffversion = "63.0";
src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
+ url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
+ sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2";
};
patches = nixpkgsPatches ++ [
@@ -42,13 +42,13 @@ rec {
updateScript = callPackage ./update.nix {
attrPath = "firefox-unwrapped";
};
- } {};
+ };
firefox-esr-52 = common rec {
pname = "firefox-esr";
- version = "52.9.0esr";
+ ffversion = "52.9.0esr";
src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+ url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
};
@@ -64,15 +64,15 @@ rec {
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-52-unwrapped";
- versionSuffix = "esr";
+ ffversionSuffix = "esr";
};
- } {};
+ };
firefox-esr-60 = common rec {
pname = "firefox-esr";
- version = "60.2.2esr";
+ ffversion = "60.2.2esr";
src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+ url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1";
};
@@ -91,23 +91,26 @@ rec {
attrPath = "firefox-esr-60-unwrapped";
versionSuffix = "esr";
};
- } {};
+ };
} // (let
- commonAttrs = {
- overrides = {
- unpackPhase = ''
- # fetchFromGitHub produces ro sources, root dir gets a name that
- # is too long for shebangs. fixing
- cp -a $src tor-browser
- chmod -R +w tor-browser
- cd tor-browser
+ tbcommon = args: common (args // {
+ pname = "tor-browser";
+ isTorBrowserLike = true;
- # set times for xpi archives
- find . -exec touch -d'2010-01-01 00:00' {} \;
- '';
- };
+ unpackPhase = ''
+ # fetchFromGitHub produces ro sources, root dir gets a name that
+ # is too long for shebangs. fixing
+ cp -a $src tor-browser
+ chmod -R +w tor-browser
+ cd tor-browser
+
+ # set times for xpi archives
+ find . -exec touch -d'2010-01-01 00:00' {} \;
+ '';
+
+ patches = nixpkgsPatches;
meta = {
description = "A web browser built from TorBrowser source tree";
@@ -142,14 +145,13 @@ rec {
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
};
- };
+ });
in rec {
- tor-browser-7-5 = common (rec {
- pname = "tor-browser";
- version = "7.5.6";
- isTorBrowserLike = true;
+ tor-browser-7-5 = (tbcommon rec {
+ ffversion = "52.9.0esr";
+ tbversion = "7.5.6";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
@@ -159,27 +161,24 @@ in rec {
rev = "95bb92d552876a1f4260edf68fda5faa3eb36ad8";
sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy";
};
+ }).override {
+ gtk3Support = false;
+ };
- patches = nixpkgsPatches;
- } // commonAttrs) {};
-
- tor-browser-8-0 = common (rec {
- pname = "tor-browser";
- version = "8.0.1";
- isTorBrowserLike = true;
+ tor-browser-8-0 = tbcommon rec {
+ ffversion = "60.3.0esr";
+ tbversion = "8.0.3";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-52.8.0esr-8.0-1-slnos";
- rev = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca";
- sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21";
+ # branch "tor-browser-60.3.0esr-8.0-1-slnos"
+ rev = "bd512ad9c40069adfc983f4f03dbd9d220cdf2f9";
+ sha256 = "1j349aqiqrf58zrx8pkqvh292w41v1vwr7x7dmd74hq4pi2iwpn8";
};
+ };
- patches = nixpkgsPatches;
- } // commonAttrs) {};
-
- tor-browser = tor-browser-7-5;
+ tor-browser = tor-browser-8-0;
})
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index bf3debf6c7b..8b7dfc86027 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,12 +28,12 @@ let
in python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.5.1";
+ version = "1.5.2";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1yn181gscj04ni58swk6cmggn047q29siqwgn66pvxhfdf0ny7fq";
+ sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my";
};
# Needs tox
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 23f0db67e66..dfcc367170d 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -103,7 +103,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "8.0.2";
+ version = "8.0.3";
lang = "en-US";
@@ -113,7 +113,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 = "1vajphnl53bhp0bnq8shljvnnq4k2wpvfrfclmxklp97lqvfl9vz";
+ sha256 = "19clhhsyhc8brjzjyrq0xl5gavwhbyq036nbl0x6dybawr3684gz";
};
"i686-linux" = fetchurl {
@@ -121,7 +121,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 = "157yd8n53w79xx58xf5v983a50xq1s0c09cr7qfd5cxgs7zrwh34";
+ sha256 = "1hlrbn8r9z93mswnaksn66azgf3zjf08wrlk58risli32j9gywd0";
};
};
in
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 8a21f2f0cc2..7ef2bde68f2 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 = "2.0.1309.29-2";
+ version = "2.1.1337.36-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck";
+ sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 87ca350731d..349ef233ae2 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs";
- version = "69.0.3497.73";
+ version = "70.0.3538.77";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9";
+ sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
};
buildInputs = [ ];
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
new file mode 100644
index 00000000000..fd047147e01
--- /dev/null
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "cloudflared-${version}";
+ version = "2018.10.3";
+
+ goPackagePath = "github.com/cloudflare/cloudflared";
+
+ src = fetchFromGitHub {
+ owner = "cloudflare";
+ repo = "cloudflared";
+ rev = "41916365b689bf2cc1446ea5717e4d26cc8aed43"; # untagged
+ sha256 = "109bhnmvlvj3ag9vw090fy202z8aaqr1rakhn8v550wwy30h9zkf";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)";
+ homepage = https://www.cloudflare.com/products/argo-tunnel;
+ license = licenses.unfree;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+}
diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix
new file mode 100644
index 00000000000..da7f509378d
--- /dev/null
+++ b/pkgs/applications/networking/cloudflared/deps.nix
@@ -0,0 +1,444 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "b26d9c308763d68093482582cea63d69be07a0f0";
+ sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ };
+ }
+ {
+ goPackagePath = "github.com/certifi/gocertifi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/certifi/gocertifi";
+ rev = "deb3ae2ef2610fde3330947281941c562861188b";
+ sha256 = "1xy09y1fdfcny1z09hd4493w1acj5min9z2sx4gfpshc80icrmr6";
+ };
+ }
+ {
+ goPackagePath = "github.com/cloudflare/brotli-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cloudflare/brotli-go";
+ rev = "18c9f6c67e3dfc12e0ddaca748d2887f97a7ac28";
+ sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785";
+ };
+ }
+ {
+ goPackagePath = "github.com/coredns/coredns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coredns/coredns";
+ rev = "992e7928c7c258628d2b13b769acc86781b9faea";
+ sha256 = "0mvlkca11ikwzii0p7g5a2z3gn1xrp7qmmjwklp4i52lbnsawzv0";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-oidc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-oidc";
+ rev = "a93f71fdfe73d2c0f5413c0565eea0af6523a6df";
+ sha256 = "00pmmky0y9a9l767xn16xlf52h81j4869n6j0xql79rybp6xc1f3";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
+ sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/pkg";
+ rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+ sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+ };
+ }
+ {
+ goPackagePath = "github.com/elgs/gosqljson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/elgs/gosqljson";
+ rev = "027aa4915315a0b2825c0f025cea347829b974fa";
+ sha256 = "14i45m1y505acvsk4l725bp8p9w3mcg49khz9hxkzg3afg7nc5gq";
+ };
+ }
+ {
+ goPackagePath = "github.com/equinox-io/equinox";
+ fetch = {
+ type = "git";
+ url = "https://github.com/equinox-io/equinox";
+ rev = "f24972fa72facf59d05c91c848b65eac38815915";
+ sha256 = "1d3620g1kxyzn8b3py2471qp8ssyzm1qnpbap9gxrmg8912wiww1";
+ };
+ }
+ {
+ goPackagePath = "github.com/facebookgo/grace";
+ fetch = {
+ type = "git";
+ url = "https://github.com/facebookgo/grace";
+ rev = "75cf19382434e82df4dd84953f566b8ad23d6e9e";
+ sha256 = "15chyvgv5y59w9x2asm0vh29cmmcji7f5vxvv8gqcr15nkyi61q0";
+ };
+ }
+ {
+ goPackagePath = "github.com/flynn/go-shlex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flynn/go-shlex";
+ rev = "3f9db97f856818214da2e1057f8ad84803971cff";
+ sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
+ };
+ }
+ {
+ goPackagePath = "github.com/getsentry/raven-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getsentry/raven-go";
+ rev = "ed7bcb39ff10f39ab08e317ce16df282845852fa";
+ sha256 = "0pqggcjbia9sidxqxnyd5z5k44iswxaqss3qvkka8bfm082kczij";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang-collections/collections";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang-collections/collections";
+ rev = "604e922904d35e97f98a774db7881f049cd8d970";
+ sha256 = "04g0xc1bs4aphc2rcj9knah2shmck500qagnazy4mg052b84ggwm";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+ sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "064e2069ce9c359c118179501254f67d7d37ba24";
+ sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/context";
+ rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+ sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/mux";
+ rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
+ sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
+ sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/grpc-opentracing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/grpc-opentracing";
+ rev = "8e809c8a86450a29b90dcc9efbf062d0fe6d9746";
+ sha256 = "1yz3gxhdipmi63n32y5srwx7p254k3fm8y64cimkb1gz7sw99nxw";
+ };
+ }
+ {
+ goPackagePath = "github.com/jonboulle/clockwork";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jonboulle/clockwork";
+ rev = "2eee05ed794112d45db504eb05aa693efd2b8b09";
+ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+ };
+ }
+ {
+ goPackagePath = "github.com/lib/pq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lib/pq";
+ rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
+ sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+ sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/mholt/caddy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mholt/caddy";
+ rev = "d3b731e9255b72d4571a5aac125634cf1b6031dc";
+ sha256 = "1183cfaryw7m3hvngzv87w80pc9vp3369sjyz7a0dlbr39jip1r0";
+ };
+ }
+ {
+ goPackagePath = "github.com/miekg/dns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/miekg/dns";
+ rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1";
+ sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66";
+ sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+ };
+ }
+ {
+ goPackagePath = "github.com/opentracing/opentracing-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opentracing/opentracing-go";
+ rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38";
+ sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "967789050ba94deca04a5e84cce8ad472ce313c1";
+ sha256 = "1djwz6shmyx5kbp9b1pim3kncq2jwn3qhbx4b0b4lq7msww76hpz";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+ sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
+ sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
+ sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
+ };
+ }
+ {
+ goPackagePath = "github.com/rifflock/lfshook";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rifflock/lfshook";
+ rev = "bf539943797a1f34c1f502d07de419b5238ae6c6";
+ sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
+ sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+ sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "32a936f46389aa10549d60bd7833e54b01685d09";
+ sha256 = "0f24khgx6s7idpnmwgkml4qyrqwkvdjd18aapn5rmybyhmrb57j7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "ce36f3865eeb42541ce3f87f32f8462c5687befa";
+ sha256 = "0dkmxn48l9g7w1247c473qlacfkfp8wyan54k9cbi79icdp65jja";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0";
+ sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
+ sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/urfave/cli.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cbranch/cli";
+ rev = "d604b6ffeee878fbf084fd2761466b6649989cee";
+ sha256 = "16csqipw5vrbb91m9w9g72jlxlrhcyxa79fz6fjp6803znmjdpk2";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+ {
+ goPackagePath = "zombiezen.com/go/capnproto2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/zombiezen/go-capnproto2";
+ rev = "7cfd211c19c7f5783c695f3654efa46f0df259c3";
+ sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index ced7b9882b9..35721208a6e 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
sed -i 's/<2.2.0//' setup.py
'';
- propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
+ propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
# Requires tox, hadoop, and google cloud
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 261d067eb1d..421fc652a32 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -11,8 +11,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.17.0";
- sha256 = "1zmywmcgfmx5ccp0qxj912sqymisxdg2s84b4qclfa225hrbaqpn";
+ version = "1.21.0";
+ sha256 = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79";
};
archive =
{
@@ -39,15 +39,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "1.38.0";
- sha256 = "1jhr2l8p7wf7kgr2y0c40n1jb9p2153xkpcp4b2half2vhsh1nwi";
+ version = "1.42.0";
+ sha256 = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.15.0";
- sha256 = "1pdmj0ww5y2nwxivlf5l886nwd76hpqhwdayab2fp16zyl1qbpfd";
+ version = "1.17.0";
+ sha256 = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw";
};
azurestack =
{
@@ -88,8 +88,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-circonus";
- version = "0.1.1";
- sha256 = "05n1q9hc0h31icxsmyi2y60wiwd5fs2hz1dqm3bl6hgh5x3ss1im";
+ version = "0.2.0";
+ sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
};
clc =
{
@@ -102,8 +102,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
- version = "1.5.0";
- sha256 = "0l8bmnxmjr2g3xxw8w0ay91cvs4kzc65wkdwybfahvq9r6mww45n";
+ version = "1.7.0";
+ sha256 = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a";
};
cloudscale =
{
@@ -130,22 +130,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
- version = "2.1.0";
- sha256 = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw";
+ version = "2.2.0";
+ sha256 = "13jwvf7n7238pzvdq9m6vnl9vqa9hkr1mrcf9sa1q9lxkim9ijfk";
};
datadog =
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "1.3.0";
- sha256 = "0d3xccfkzibjp4jl8irja1cdhppdn3b7nh4wy857zvfxpfhz7aj2";
+ version = "1.4.0";
+ sha256 = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "0.1.3";
- sha256 = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k";
+ version = "1.0.2";
+ sha256 = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6";
};
dme =
{
@@ -172,8 +172,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- version = "1.0.1";
- sha256 = "1q5bsdvp47gvpiyqlzgrpxczlh6m9g870pn84ks49xfkwk5izpz6";
+ version = "1.1.0";
+ sha256 = "1ba9z9fd69hpg6kg30nf95zzskzipi74s1aadywc068gfrkdm9jj";
};
dyn =
{
@@ -193,15 +193,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.3.0";
- sha256 = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0";
+ version = "0.4.0";
+ sha256 = "1fkn9b6ibs36cmhknb3x05g31rf73w70xwx05rh9fhybrz5dd9z9";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
- version = "1.1.0";
- sha256 = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3";
+ version = "1.2.1";
+ sha256 = "000v6fmmnwfibzfssk23s9qwrb8a9l0j1qd14x2dqsc7ql0kbnz8";
};
github =
{
@@ -221,8 +221,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "1.18.0";
- sha256 = "0zwy1imby0xqvb86a82rdvglipf2sfpi3rmsj72iikp7vi3mqk64";
+ version = "1.19.1";
+ sha256 = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0";
};
grafana =
{
@@ -235,15 +235,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.3.0";
- sha256 = "0sb9pajsy0if18vgw5pllgv8qvb4v7pv65m2f3hfkck2za82ndwb";
+ version = "1.4.0";
+ sha256 = "00mq6p2y61z4hg9dncf3mj59cp6fx4iqrn86m96wkw346shs6prs";
+ };
+ helm =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-helm";
+ version = "0.6.2";
+ sha256 = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "1.4.0";
- sha256 = "159a9add5v4dj2bry1b85i74q2lb4pjjypkm5hzrbqys6gn2imhn";
+ version = "1.5.0";
+ sha256 = "0hzzhqd87vkcbzndsn15g4nl3qhv2kvnhs9zv6kbxaxm7p7rm3pz";
};
http =
{
@@ -284,8 +291,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.2.0";
- sha256 = "0slvhj8f7p27r9v4vb5vjyqpmzlpaji1djzwsxsf247df68mka61";
+ version = "1.3.0";
+ sha256 = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3";
};
librato =
{
@@ -294,6 +301,13 @@
version = "0.1.0";
sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
};
+ linode =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-linode";
+ version = "1.1.0";
+ sha256 = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3";
+ };
local =
{
owner = "terraform-providers";
@@ -340,8 +354,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "1.0.1";
- sha256 = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq";
+ version = "1.1.0";
+ sha256 = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b";
};
nomad =
{
@@ -371,12 +385,19 @@
version = "1.0.0";
sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha";
};
+ nutanix =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-nutanix";
+ version = "1.0.0";
+ sha256 = "16nky5ryyjvv7vny18ymxvy20ivwmqw7lagnz48pq8mnwwrp5541";
+ };
oci =
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.1.1";
- sha256 = "0wrvb44gs0c1khvam5lrq53l2889japg7d4nyk2hrpywy9japc8m";
+ version = "3.5.0";
+ sha256 = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf";
};
oneandone =
{
@@ -389,22 +410,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
- version = "1.2.1";
- sha256 = "0mnvi47kbdwwpfzdlcd1mhd15w5b0ivwxi1a5lvs0zyqf0g0cas8";
+ version = "1.3.0";
+ sha256 = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p";
};
openstack =
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "1.9.0";
- sha256 = "0prmdj78jsyrns876cglfp8a3dbpfl33bwb0dj072flh4yknfrdr";
+ version = "1.11.0";
+ sha256 = "1wqb7q10nyr4jy9ny4giazblwhh3qrn4s1f0xb5q702b5igbfwwm";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.1.0";
- sha256 = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny";
+ version = "1.2.0";
+ sha256 = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9";
};
opsgenie =
{
@@ -431,8 +452,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "1.2.4";
- sha256 = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva";
+ version = "1.2.5";
+ sha256 = "1c40w1q18piip4fn572mnf67g07h6g03hnin23c7jw265m4yr222";
};
pagerduty =
{
@@ -445,8 +466,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- version = "1.4.0";
- sha256 = "033xpglbn0q805b129kf1ywl13m4pgrkwlvgl347nldysryiasxq";
+ version = "1.4.1";
+ sha256 = "1mlz01v01675cf9ja8i42c6ssklf65kd8wpjzf0j472lfwki4xpp";
};
postgresql =
{
@@ -508,15 +529,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-runscope";
- version = "0.4.0";
- sha256 = "1n3q2hdwvkkn5rphrcl5qfv4ry2mrr13dcjwzhbym2i1nhpxkld0";
+ version = "0.5.0";
+ sha256 = "0n0m39gaiwhqigjny51a7g36ldik33alimkqqbv6hqyzrhk0qs8h";
};
scaleway =
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.6.0";
- sha256 = "1ykcakfw0gp239jp4brpjynxzzvlhldfpv12hkgymj22s37n5jnn";
+ version = "1.7.0";
+ sha256 = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk";
};
softlayer =
{
@@ -553,6 +574,13 @@
version = "1.0.0";
sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz";
};
+ tencentcloud =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-tencentcloud";
+ version = "1.2.2";
+ sha256 = "1ypsfm48c30szg3zc1sknblhwcnca8aapfgp62bhszyqxq6zq37s";
+ };
terraform =
{
owner = "terraform-providers";
@@ -592,8 +620,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "1.1.4";
- sha256 = "00i9rl9pnmicvndkmvcmlj6y80341dmkqnhq09f94yljh1w1zpvv";
+ version = "1.2.0";
+ sha256 = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b";
};
vcd =
{
@@ -606,8 +634,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "1.8.1";
- sha256 = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
+ version = "1.9.0";
+ sha256 = "1by9klwvdw3m854jffimfnsz1lnbaixi4zcv4zzs63dc3flwy2b2";
};
matchbox =
{
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a4ffe27102a..583b6a06aea 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -113,8 +113,8 @@ in rec {
terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
terraform_0_11 = pluggable (generic {
- version = "0.11.8";
- sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh";
+ version = "0.11.10";
+ sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 0190d5f9798..36b4732ca2e 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
+{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
-python34Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
version = "0.9.9";
- name = "canto-curses-${version}";
+ pname = "canto-curses";
src = fetchFromGitHub {
owner = "themoken";
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 4b1721278e3..e700c5634ad 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, python34Packages, }:
+{ stdenv, fetchFromGitHub, python3Packages, }:
-python34Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
version = "0.9.7";
- name = "canto-daemon-${version}";
- namePrefix = "";
+ pname = "canto-daemon";
src = fetchFromGitHub {
owner = "themoken";
@@ -12,7 +11,7 @@ python34Packages.buildPythonApplication rec {
sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
};
- propagatedBuildInputs = with python34Packages; [ feedparser ];
+ propagatedBuildInputs = with python3Packages; [ feedparser ];
meta = {
description = "Daemon for the canto Atom/RSS feed reader";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 7c630e522af..46157c2a35f 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
+{ stdenv, newScope, makeWrapper
+, wrapGAppsHook, gnome3, glib
+, electron, xdg_utils, makeDesktopItem
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:
@@ -26,16 +28,25 @@ with self;
stdenv.mkDerivation {
name = "rambox-${rambox-bare.version}";
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ glib gnome3.gsettings_desktop_schemas ];
unpackPhase = ":";
+ dontWrapGApps = true; # we only want $gappsWrapperArgs here
+
installPhase = ''
- makeWrapper ${electron}/bin/electron $out/bin/rambox \
- --add-flags "${rambox-bare} --without-update" \
- --prefix PATH : ${xdg_utils}/bin
+ runHook preInstall
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/bin/electron $out/bin/rambox \
+ --add-flags "${rambox-bare} --without-update" \
+ "''${gappsWrapperArgs[@]}" \
+ --prefix PATH : ${xdg_utils}/bin
'';
inherit (rambox-bare.meta // {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index af92462a2a4..efecebe169e 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, gzip, which, unzip, jdk }:
let
- version = "6.5.3.6";
+ version = "6.6.0.13";
srcs = {
i686-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
- sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9";
+ sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz";
};
x86_64-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
- sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz";
+ sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4";
};
};
in
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 70d27218783..fd9fe0bdfbf 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "0.16.5";
+ version = "0.17.0";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl";
+ sha256 = "1ffbwz7wp1xhfv8a5nhrhw97nl5ybf0j97dkk2sy9cdlribzxs04";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 92f0b11c63f..ca6ee04d370 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,11 +56,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.16.3";
+ version = "1.17.3";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1fhs3408i8f80z5rlchrc3gwm0481rxqb5jk37gb8ip94zf97hsf";
+ sha256 = "1k0gj24562jfj748s7qcn1f7brr1c0zn2dppxvfv2ka2r2n0z1h4";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
new file mode 100644
index 00000000000..79464f54232
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ # https://github.com/erroneousboat/slack-term
+ name = "slack-term-${version}";
+ version = "0.4.1";
+
+ goPackagePath = "github.com/erroneousboat/slack-term";
+
+ src = fetchFromGitHub {
+ owner = "erroneousboat";
+ repo = "slack-term";
+ rev = "v${version}";
+ sha256 = "1340bq7h31fxykxbxpn6hv7n2hmjf20f8vg5gan9pjf5jaa6kfza";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Slack client for your terminal";
+ homepage = https://github.com/erroneousboat/slack-term;
+ license = licenses.mit;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index ac58d4f39d6..8297304e55c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
bits = "x86_64";
- version = "4.3.0";
+ version = "4.4.0";
desktopItem = makeDesktopItem rec {
name = "Wavebox";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
name = "wavebox-${version}";
src = fetchurl {
url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
- sha256 = "0kdg5q9rv8nxlg5jhmdfy5vv7gkdswzhy49af29d3zf57z69187c";
+ sha256 = "0g77clrxks1ivldq496bg14hv57hm0kjh4g1askxyck69yf8illn";
};
# don't remove runtime deps
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index bf5d0642314..7ed237ce6aa 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -6,7 +6,7 @@
, asciidoctor # manpages
, guileSupport ? true, guile
, luaSupport ? true, lua5
-, perlSupport ? true, perl
+, perlSupport ? true, perl, perlPackages
, pythonSupport ? true, pythonPackages
, rubySupport ? true, ruby
, tclSupport ? true, tcl
@@ -30,12 +30,12 @@ let
weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.2";
+ version = "2.3";
name = "weechat-${version}";
src = fetchurl {
- url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg";
+ url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
+ sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -70,13 +70,6 @@ let
done
'';
- # remove when bumping to the latest version.
- # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c`
- # from weechat upstream to weechat-2.2.
- patches = [
- ./aggregate-commands.patch
- ];
-
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
@@ -108,6 +101,12 @@ in if configure == null then weechat else
extraEnv = ''
export PATH="${perlInterpreter}/bin:$PATH"
'';
+ withPackages = pkgsFun: (perl // {
+ extraEnv = ''
+ ${perl.extraEnv}
+ export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
+ '';
+ });
};
tcl = simplePlugin "tcl";
ruby = simplePlugin "ruby";
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index eb4d710857c..72b9ce09d76 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "inboxer-${version}";
- version = "1.1.5";
+ version = "1.2.1";
meta = with stdenv.lib; {
description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
- sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4";
+ sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c2c5d18e2f0..69de3ef5d51 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fixDarwinDylibNames
+{ fetchurl, stdenv
, pkgconfig, gnupg
, xapian, gmime, talloc, zlib
, doxygen, perl
@@ -34,18 +34,11 @@ stdenv.mkDerivation rec {
bash-completion # (optional) dependency to install bash completion
emacs # (optional) to byte compile emacs code, also needed for tests
ruby # (optional) ruby bindings
- which dtach openssl bash # test dependencies
- ]
- ++ optional stdenv.isDarwin fixDarwinDylibNames
- ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies
+ ];
postPatch = ''
patchShebangs configure
-
- find test/ -type f -exec \
- sed -i \
- -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
- "{}" ";"
+ patchShebangs test/
for src in \
util/crypto.c \
@@ -54,6 +47,9 @@ stdenv.mkDerivation rec {
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg\"
done
+
+ substituteInPlace lib/Makefile.local \
+ --replace '-install_name $(libdir)' "-install_name $out/lib"
'';
configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ];
@@ -64,33 +60,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = "V=1";
- preFixup = optionalString stdenv.isDarwin ''
- set -e
-
- die() {
- >&2 echo "$@"
- exit 1
- }
-
- prg="$out/bin/notmuch"
- lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')"
-
- [[ -s "$prg" ]] || die "couldn't find notmuch binary"
- [[ -s "$lib" ]] || die "couldn't find libnotmuch"
-
- badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
- goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')"
-
- [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary"
- [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
-
- echo "fixing libtalloc link in $lib"
- install_name_tool -change "$badname" "$goodname" "$lib"
-
- echo "fixing libtalloc link in $prg"
- install_name_tool -change "$badname" "$goodname" "$prg"
- '';
-
preCheck = let
test-database = fetchurl {
url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz";
@@ -99,12 +68,14 @@ stdenv.mkDerivation rec {
in ''
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
- doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0");
- checkTarget = "test V=1";
+ doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
+ checkTarget = "test";
+ checkInputs = [
+ which dtach openssl bash
+ gdb man
+ ];
- postInstall = ''
- make install-man
- '';
+ installTargets = "install install-man";
dontGzipMan = true; # already compressed
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index a97dfce2744..576fbcc7b8a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
{
- version = "60.2.1";
+ version = "60.3.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ar/thunderbird-60.3.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6";
+ sha512 = "7cbd8c54fb220ad3f781cbc908d42f2723109786a1d7a947646bcc231e8849035c014335daa4ab85f9cd69646fa870cbfac3a0e0ec45d3fa82d0f0b74591b6a3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ast/thunderbird-60.3.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379";
+ sha512 = "936a6366add759a89db391394479ff2e7865248b46c81cf45457ddb6fa6b37660ca9efa6f125fe97b22f6db2cdfae7ad0abefdc3874820fa3ef0bee91f6caa74";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/be/thunderbird-60.3.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389";
+ sha512 = "4580436c4719a2ca5821d9676aa6bfd5f2c731cdf0bdc2969fd0177bfd2c3cc2570479de60515e59b152e0aec4611c437fedce7d0bd13c7a06bcebafff0bd20d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/bg/thunderbird-60.3.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9";
+ sha512 = "fafc3c2d186616be2b56e1087df528d3fb93ce431ae24c286c0209177a9dcf5f229ec5aa521d68ae531c5d763ca4c2e339945a7f874825e73ad63f86d13b510b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/br/thunderbird-60.3.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af";
+ sha512 = "71fe4d4e67971bfdc56ff6ad73eecffe15d2b808e07b25a7b4c827094b95afa7c04d451081dc45045e0d1eb83b15a3c8e964186a615f72a0a545dece221318d9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ca/thunderbird-60.3.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85";
+ sha512 = "0be271223abd6f0fe79d0914b037cea5ea765ac1486a78922123666bec1ce8ec3bcbfa54c7fa552101adbe4a22bed0628eabed39391e4ca1dbccb118157fbded";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cs/thunderbird-60.3.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b";
+ sha512 = "5d9f911af1f29928ddfb96d114fc7e484370e69f9f1aabdad753dae5ba0b6ad476d7b0c373919a2ccec3c2528f4fc78ee874a72fe691ad3e7d2e3e9e1650f76a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cy/thunderbird-60.3.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc";
+ sha512 = "18c7dabbcdb5235bcfe0dd01746f39d82d88bc71c2a4c4986ee268d15ab5a5cc060273f4783b2e472dafbcdcd98f29f8ad2c2b33ed87a9a3c484f61dbf0a7492";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/da/thunderbird-60.3.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97";
+ sha512 = "f6dcc69ed4509b6d81b856cf6981d7d00e3ca3689f3e28b64b858d64f96ef96196a4b9b2c14ee5292507b5ba00bedbfd5ecf4b2db241068b36d8ee786eacf1c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/de/thunderbird-60.3.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49";
+ sha512 = "a60ab91787961d405c926027570d161e9f6cfef77f6e8d40a24e97ac5c0c9b515a31dde5b9386e7b2a855f4970ff7533be4252474136e242a998cafab123de66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/dsb/thunderbird-60.3.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f";
+ sha512 = "c827f7b392fe42cd2f6432870552239bd73e808ddfad10ac2c86968915697dfe119c965469baa6e2098bfd0fb61c36fbb5ed17378e423531b64b0ebd153602d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/el/thunderbird-60.3.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219";
+ sha512 = "287be8c4ca83f7238833cad36de9476907bcf9c8c915626dd0c5114328160e75d95bfe25a0db10900f3c2a727e76f583fe1902a76c208106480fc3349c2ed917";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-GB/thunderbird-60.3.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668";
+ sha512 = "aae1c22caeab14d262054af5855f6e983b34fc54e8f9d8cd0f49f5ae7ad3425d74f26025d85b4948a7d519ba771f7298ca7bf14fbd67c3d8ed84f0e9e394b9da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-US/thunderbird-60.3.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362";
+ sha512 = "53b3872c3e4c49080e34540f95d5dec680b2320890601249eeb09e26d8aec66bce8e46e40368c8cfbc6937186a894a078348f64065ead28d32453a310a43891f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-AR/thunderbird-60.3.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e";
+ sha512 = "9ae6f2a7c93a1d7a4efa22bdc8f6f5df8fb5a46f42507146eec7ceed6ee47d175d6c7791decc661be0c7d3cfd7513cc9a050138fe6661daf192f5f6064bc6a8f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-ES/thunderbird-60.3.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a";
+ sha512 = "6dcc03919a384f7dcfae1264e3176d57ced792cb40ce7aa469a1c5229c9c97bcc83a0e58947f0ed14ff0ff74ddc529c74e7bcd3e38fb89edcdc4038f491a1c08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/et/thunderbird-60.3.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f";
+ sha512 = "eb18921995d209a95444ae213740596ebb0d70d362662741a94a196e75c8b5857ff999ab4c822c95eed1ba3339038b82c725dc46e05d21bc4a5692323a87c589";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/eu/thunderbird-60.3.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06";
+ sha512 = "5fc6dd684e9f1ec9be951929f2bbed0e75f5e2c0215206496a2efecb361f194a2009fe5bf2e91f09cae63dfc3f08b51e47a2a82d6b59d425df8dcf4ba316b271";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fi/thunderbird-60.3.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721";
+ sha512 = "9da23f9aba9cc5f8939bdcf632f764566acbafc48bd05dc04036eae5fc04f41df506a4f80f3543b60a09b057939c074f3ae9eefc2353f765256dc9e0db1aa8e0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fr/thunderbird-60.3.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2";
+ sha512 = "0c844ef274cf892cadceea78c93efde1f7a110bfd0bdbe3cfdba5c23fef0e2fbb7b3fc3dc59f9b6edbb5c346a6d5ac06b69f4b19541942d09c5d088d6b0e0322";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fy-NL/thunderbird-60.3.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9";
+ sha512 = "0df85e025f9a72255a23ca93a692a0f79a69c9447f8391ff97eea075077a147c6eb164f4851dee47d771dd3db3bacb3dcac71aed91b39fc34dbd65c8ae67bcf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ga-IE/thunderbird-60.3.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e";
+ sha512 = "e1feb134d5ed55269fead90efea01f4d74ab03517def2fb9418435c5c699735d14ef3f64bfd33109b87bedefcb90034b1c12da74b798eb0e6b7bc74766d3f425";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gd/thunderbird-60.3.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af";
+ sha512 = "3483c8655e81938554d95492952b967770cd659b625c25dc8864e59dfd5b6cc94bef725f495e725d6ceb24bc05edeb1d2c3ce41a303bc313715788ab03b75c9a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gl/thunderbird-60.3.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a";
+ sha512 = "012ca498f3907f077c9e75e2bceb53fd0a781752b98319cf3b7ccb94a9112896dc2360d45acc440d7c50bdad0a15e125ad8123e13203a3a017e905c2f0e3d252";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/he/thunderbird-60.3.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b";
+ sha512 = "1d7f92a0274bed7390ad0f813066dd7d71bd66f03ea8203d71f025a8f8a8fb4480e2b660ecbc052290a27351662d3f7811c1311eb8ff02e63ffc5f0c8745edfd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hr/thunderbird-60.3.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295";
+ sha512 = "6d19c5ad55486b3aff055476a29353179bf8ff7e9285618f29490c430817af2ff3bc51cfa75c52c82d804a7bce0e367e8ee4d444a03b0bdf4bda57ab75bcd016";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hsb/thunderbird-60.3.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6";
+ sha512 = "452927013a6ddc2f2f0dfe3a69a585641df06aac24f6458bb269095abe35101bff6c1a37d21afe8f37f1856a7a3311d49409bd0c456b52eb494cf846e426e2dd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hu/thunderbird-60.3.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2";
+ sha512 = "bbda4eceb8258bf46ed5a90d4bff27a769e0f74a14d76f50e77fc3b2f1b53863fe8a68f0e375aadcd0d60b177f7f31edc6876666dfb95e955083078f813896b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hy-AM/thunderbird-60.3.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47";
+ sha512 = "79ca9e61fcfb62da522c2cd23a39e1ec8be14dd09bbf3d1cee23bd2a74a9a94a4b9b20af6f37e2a6a75d4b416fbf2b8c3f5196ea4fa52495dc0628a2ae5b26bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/id/thunderbird-60.3.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c";
+ sha512 = "2959a8ed196509a6a844db918b283bb3b133b1489cf229e0649ea0033fcd0536cc8fa792554adc7148c41267dabc92309670da6fbaaa1329bb65340192ced249";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/is/thunderbird-60.3.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f";
+ sha512 = "f78de4c7e0125b14a5930cb081bae4b49010b47726268b4e6ce01a0eb0e26b627d5ba47284c060031175787146406d4bca86404fa3d79f3ea67a67443e813862";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/it/thunderbird-60.3.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33";
+ sha512 = "2a855ca03a703a7e843c7101ff02be356e5851fd2f6d01d1c1a6012946fb5bc57c018fc4e9804cdf66a7febc91c80c278fd420f068bef36bf1daff6f8a3c7640";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ja/thunderbird-60.3.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3";
+ sha512 = "323222bffb53d7a8c983bd5a2e06d388fa64689e4a31f888e6919b1c5fd9fb192840fb6c914db1ef988ae0f7505339d086b5388e9690eb77d377ef8037880eef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kab/thunderbird-60.3.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488";
+ sha512 = "432426fa6185ef49dc7a204f97e38214dbc70e63a960036ca96d85c1a8fe10e7818dec80013c7d812d40808303cc09b70bf1bac8534eebde089e0d41387be797";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kk/thunderbird-60.3.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d";
+ sha512 = "a0d4da436365759f0019250f42bb05304a5c80886268a0ac2ea76bb52167670be71fd036392efa6965d699171341b23e2360f795770de0ebc5f4973ce6cdadfe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ko/thunderbird-60.3.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500";
+ sha512 = "ed28830ab1af7482115e53b0a4486d74d2b87b98f8c12a45f6a54c2221de5fae7b7450f1cf07a095d68638bf9f8b25778784606d857067b2ddb142079b411fc2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/lt/thunderbird-60.3.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa";
+ sha512 = "52d36def8bf79c58002e42d7912598630140646cfd23254821524c42faeba3782d2d9f16db4ecb432457298bad342648e2271ff71a2d1e6fcfd386134da2265f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ms/thunderbird-60.3.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec";
+ sha512 = "d368bd578add39df284174dbf1eb97e5e3eda26b141af1c729db98f93782fb8da7dc44fdae0ce9a3c070c5905a73dd0dd25fd665144e7af33f975867997437b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nb-NO/thunderbird-60.3.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc";
+ sha512 = "ef795c45d7ccf4b8c89abf804d5e758e14534b9d12a1424ae0fc58bb5681dc24e49d6972c128855f886b996dbeaa8a7af0a1af6f4959fbcacf575307332e528a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nl/thunderbird-60.3.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5";
+ sha512 = "c4d62cdbc421c08d1fd4d8579d58993d51f6cca207d1619240d95b2d9f0484e7e93f4dc6e103d09918fefa384349e5d676973b43a6113f807c28879d829a6d3b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nn-NO/thunderbird-60.3.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c";
+ sha512 = "f06459d02dc5d0be311d06c62cdb2a11199722d635411fd63773b01c9103ed232070b3cd9c6c3984e658a54007f8fbf728c51346cdd3a1eee243ecc3bda8bd9b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pl/thunderbird-60.3.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0";
+ sha512 = "77b27ba6c8bc519aae04f1576d278690f24a165a53bee7f1341aa81d2441fe86bc02115a3ec6e3dd3f40d466d6a39bcca615d70e9504945355e706b69d9e68d3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-BR/thunderbird-60.3.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a";
+ sha512 = "a480dae9a78d473a1614047d2e973f4706ab5a2b754fdecd83cb1eea988f78c53760fbaeea3e98206400a3809e419a5615aa745bd759d652d6f7ce8680d096db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-PT/thunderbird-60.3.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554";
+ sha512 = "af3fb38963879e99e2c3344ebeca0d300f87b96c4dc031f50dfb5c75e04e1189c930b2df46aa4a343ad93b9461ac38439936ca9a3bc83948668b662f6be69599";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/rm/thunderbird-60.3.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262";
+ sha512 = "454264f5629854bdc037c4d826ef31a5fb4857f14aee5780669832e298b788ca98d22c521360dfa5d4f3ff25a18ecc267120a8455423785c801b1a51115ad90c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ro/thunderbird-60.3.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c";
+ sha512 = "5c23f69b167807abd0823f2b0e81e58695fe7cc53f6edd5ed5f67da77ab3b461637cc3d84dc0c77680421cf70dcaae1190f653aeec82cd6e2e89d429a30f0f1a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ru/thunderbird-60.3.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4";
+ sha512 = "2a2cd091d81da62e24fe7b454fd28477f6089b0982a21973d2e68d78548d90d33eea34c324fe7389100a7938dad226be6f4a3095eed0587b047a9a0691d2f190";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/si/thunderbird-60.3.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68";
+ sha512 = "75ca936cc8f3f17803e2e4f086da82598f6f78c4977c239bac929b950b388c61bf675d904638dd4b801afc7a9b58bd9ab0b04b2cecf5f2487e64ef0a599c2ad4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sk/thunderbird-60.3.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d";
+ sha512 = "cd34d310fd49a8c7fa47731ac8972c25b2d32a4000ccbc8ff0dc4c7b2d0c5905942176b6f85d777683204c9d35f4c49c5195740afa8971e4782441a1ea38a0a7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sl/thunderbird-60.3.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a";
+ sha512 = "cacdb9aa0d01f9641863b52b0c2ec2c61e3c60c03fb7fc1da1fa42cbcedb94797543fe6984538d3ff75594726dc61a1676a2644abd6595902bcafad36d4d370a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sq/thunderbird-60.3.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa";
+ sha512 = "6930f66acf54dd47e2cfcb50d2b451a90a4533f54c895d16a872dfb28266d33596929cfa81fbc21536ab1ab7f933d4fb9853979c8be9a621c416817ada423fd3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sr/thunderbird-60.3.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f";
+ sha512 = "ac987c431c719e2c4a61a421a0b2d03bde011579782b29f589efa7f5361879762c0df5d57e809b9386072004e2c85f5aeb770185c6ad3978ce1de0fdc6b6346c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sv-SE/thunderbird-60.3.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419";
+ sha512 = "078765f08b2f6f53f319037f1237bc68ffeebfa1437fd921051a1f804f8f6e4fdcf7faa377c0fc066f8adf49a0bd6429981708ac3e0dfaffee3f196c9f97c8e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/tr/thunderbird-60.3.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0";
+ sha512 = "4ac98caac0d51467059c90ef0867b78847c7260b4fa36187ccd670f7275ebc1cdd93fbfb934575f82d2cc7f0b0cae6b781842a883e5a8242b3f8d6295d18ae33";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/uk/thunderbird-60.3.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5";
+ sha512 = "9a187b5a401eec58a0c15dceb0ad0e894036f4d2af3e3d129444e31169c1fafff7228093ebb0acf37b9896d72eb88d02d04f8bf16be14092bb27086816a06a65";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/vi/thunderbird-60.3.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200";
+ sha512 = "53388ca676a3c15b41c8ac68a75de4aa10cec3953ff30bec1f67008a26d64a16af8e996b9196e1a23db0f00d835ec5bd22e3bf7e411fa6f8e4d276256afc2a69";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-CN/thunderbird-60.3.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8";
+ sha512 = "05de7f60510764ddb49b81b907b2b0f3047b38da361a3ac655266b2ecd90320721b3023d943a5fa8fb20ae632625b7dba394bfa85e54434718d392c035abf29f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-TW/thunderbird-60.3.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d";
+ sha512 = "f2aeb51217083f284af5150179f4173212d9837e4b85225610db78524fad92ca5c29bf6461543e5ca6cdd2c31f11886837651912682d5e07a82f1bce9a82e879";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ar/thunderbird-60.3.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b";
+ sha512 = "ccd98be198eeaa462e60815fd23a64b854294a63965302477006eb0650dacbf0a9b84d2252bf93a7203410ffece84da42170450303d8e398253f1675e870102d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ast/thunderbird-60.3.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef";
+ sha512 = "95e3737727be104753390535d4b963316d95f80ebaf3e323d791287a12e3b3c137f991e4752dd1d6a7a9e9683d945c047963f7c2f7dc9041abf367a2e85741e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/be/thunderbird-60.3.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0";
+ sha512 = "4d20ea0dfdf556b10d5a47795739aeccb992f5d5970d30c5d90040ec759dd269ec2a146d47074c19d5bae8f8add2bba37b8dfc9b5f16d1eeef88f0dadcd85543";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/bg/thunderbird-60.3.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d";
+ sha512 = "085f87242fe9416d6078c1c921bee327772eceaf84787d8ab407fb836c70ef8cd955ef98ca5532952d6ff085005d197f240a92d71cda6f36c0cd171c840ec937";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/br/thunderbird-60.3.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e";
+ sha512 = "4f95501c6fbfb6c24ae126f7d9e9244c76a84be001f97b0f052f4fd447fa2f8a9357838abb058839072ca5b77409ddf0ff3dde908a4fab884bf120d86c22483c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ca/thunderbird-60.3.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59";
+ sha512 = "31329841c564aa4bf488d324b19d62cce15397e2c7bda7714c218907a404447187612b353ce712c647a8a5251ce41b7b07a9dc79e9c9991275e09276216c41fd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cs/thunderbird-60.3.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48";
+ sha512 = "f0daaad120fc7a8958f45193151307b386f703c745835c069db7627bd74a8be594d30e4706463468b6ca861c0e628176325bfcff02e3b24ee9e7ebc35ceb76f6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cy/thunderbird-60.3.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041";
+ sha512 = "e44f4003847e7c72c681f9cb8e8b02c05420a88d99a0f2831fe02e256410ed4a2d41070d3674227a436a9045fc3ccdd242532cd5aec8c31a93d7bac2f85e3308";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/da/thunderbird-60.3.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8";
+ sha512 = "7462c01d3b9e7ea07047115983985b8d9bf7e71f75ac091248b41bd1e50813971843dcf6da71dfbc5f7f74a5d5fdc50c1b464cec90c4c3e649c9efe3f045e5e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/de/thunderbird-60.3.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8";
+ sha512 = "0c6e1fa83a9a886062ca3123671091b9001c2f54d1b0988a7b68e4e5900c036f436d3686bb0cf346a92e7426b9153f6f58a992766f0df215dca33317b81d04bb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/dsb/thunderbird-60.3.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d";
+ sha512 = "de2ae2d5e7abf26e021671d4cc8b1ed69817b4ef2361416405f60737d6eb117b10fbf3fcac7d75a204ce483ac6d0623e0b78a27c8229d11214cb6ce02fa70756";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/el/thunderbird-60.3.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d";
+ sha512 = "b52519e5a0040b92c59eefd9a6b6908711b9685fbdd46b9c26149a83c37e0b31aaa591259e6ec40088443a7c9ca2fbe5fc4a4ee046a226a6493eb17c12d1bab5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-GB/thunderbird-60.3.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05";
+ sha512 = "9c0bb3da4f47a6541b8d4d2db5eaf37f04a0190f6761f6dd09aa67a58de66b81321b9985470c09cb6887c660939615971bdae6626c49fbc77365bbb93434449c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-US/thunderbird-60.3.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b";
+ sha512 = "da73b44eb926b981ba6855b9b1e79a030740499ce6d374922a47e311e4b6bbe8c9f39da19bfa705392edd0c0c3e0de1ae86d76a81cd1508ecee50c69bc69e43d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-AR/thunderbird-60.3.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2";
+ sha512 = "fd66717fb818610199eb628e22c5067892740c04924b406ce951afb5ee2a6e7a872224c6419c185b327a4e59f984bdf144628903f8a7bed10d4ea9247afc188f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-ES/thunderbird-60.3.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c";
+ sha512 = "078d8eb9a7f1373ec90f0e3a1f22881546489fbfaec1fc4c26c6b85867233194c595d417221f6bd801338798bcf46506390d43d835604f8e188a4010a4610500";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/et/thunderbird-60.3.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3";
+ sha512 = "c10994ebbe72d3dc4fa27b8dab56baf1625f6d128f961bc935139d224874959f3fe7f6b0d30ec7e72a8c6d49fc81761da1231170cac8d0d74da4354b59e1a407";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/eu/thunderbird-60.3.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436";
+ sha512 = "0ca85492207350ad85731606bc298765b594a33db3c7889771cd92676e1e04240b4bf4ed9c540b94e61306c0e581ef656ed05e2dda9e333cb107285dd5fc98d9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fi/thunderbird-60.3.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295";
+ sha512 = "9d5082cd17e1975152daca9247f103f0a6ddf09cad6c017f3d0ff9f185af58d88f6802e2bcc48206c97c40828335580584dd4ad62b322829169b509a48c353ff";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fr/thunderbird-60.3.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d";
+ sha512 = "33d0496886cd0ada4f944a409d5cef5294d5dd7a3a10874558538a1b5a31e212ae9b3d5661c9e719a64419859e9b1d2945f475b91106b3f30aecf617ee6dab18";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fy-NL/thunderbird-60.3.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a";
+ sha512 = "64ad8e580e8b1f8acdbb52245dbeacc22cb15471f9aabd091bfb262669c81e59e2fcaa2b31ce7fbd2d634896a9b0d22884d4151b3d90bc50b75de7f2680be852";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ga-IE/thunderbird-60.3.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f";
+ sha512 = "0fa4eebfc335022de2118a1bf5b27f83969ab26bf2d03d011d732cb8f2614bd75a60629a4f6c410a4fdf8ac8b3043c849aced85d7cf21bcbd263025ee0338234";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gd/thunderbird-60.3.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743";
+ sha512 = "7cd1f55355fa2eecc6e6f79bb642800a014de93d80c273b57c9e910111684cd5f59d26ef4fbfa1bf6a6b1aee12f19cb2a0d376a9822fe8230ee9c7f81deef54c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gl/thunderbird-60.3.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308";
+ sha512 = "b5c1853b7a225116bb0c6cbca7dcac6256c8d46382fba5af5bdbfd7fec0bf6ce01def72ca1fd26c8243c7f1d77de7fabcf691dc956eaa911997915629a03fac9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/he/thunderbird-60.3.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42";
+ sha512 = "9155a7f37288baccadf31063a9955a1b7f6a9a7172c2650c5fc5ea32f3f473e5a682a6e269efae4429f23dda15a2afe00119594e4a5e9225eb298fd8ab48ae84";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hr/thunderbird-60.3.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963";
+ sha512 = "7fd14cf6e2844d264c8931e740f0281efd3b205bbd3bef08906628e6a65a703642c0794e85c8f2d56d944b6bc5b0d4590c369c668a13f54379e91d16d124b29c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hsb/thunderbird-60.3.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76";
+ sha512 = "eec8cd8a07f1d044387fd540d7ab848c562f36bebae19ab4b90dee0043f0578b21af9b1894d88db344adbee1127df5822e50caa8563c15fe5f2996c8888c35ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hu/thunderbird-60.3.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107";
+ sha512 = "af2a83eb2cdcd184c36c4f190690b50747a7df4e9b962f4858e41657ca1ce589e9e7167192a3a678d60458cf7fca89a3788607c100b96522d58d465b3f84dfc7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hy-AM/thunderbird-60.3.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955";
+ sha512 = "0647b06bb64dd7f749029d95c242acf3a9c27e75c234198275d8d533d3376d5b26e9c872a75b966d6dcf2ccedc9054d26c56a474286d4108d298b69687be908a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/id/thunderbird-60.3.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1";
+ sha512 = "3a9a6fc713a8fdd9e28db9f381632ca65f00d78e642922091a6df4386bff2db0f1925118a2362073bab3565cc6741a64804c17e577568e665a3ba2414bd43c87";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/is/thunderbird-60.3.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42";
+ sha512 = "a041121fd514c3af8fca1451992cf15642a5bfbff14336769afb5de56017362e35cbd3c3a9717a1ef861b3b47f5951670f37bac50ed318c60bb932196aaf4798";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/it/thunderbird-60.3.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae";
+ sha512 = "246dcdba4a29d3ef657edf9850727baccc3c6246a56cdf9b0634faf54ed2b2736cccf6c544fe34ada3efcfcff5ad334ad3a4b1f29e986518dc88816d727b42c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ja/thunderbird-60.3.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e";
+ sha512 = "f6ada0506ce125d46721710dae96f086da51abb15c3b20c5d5425946362534d8c99d67e3002131390e774b2ef867f422db215b51f368074b54f1f91e7fece482";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kab/thunderbird-60.3.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23";
+ sha512 = "3838eb63f96e916402bd158aacb082ae97a9044cd0a6133206da0f6f8d389c361b55e84295b8c483a4be5920aa12b2eb3961525cb011327efcd720856fff41ff";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kk/thunderbird-60.3.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697";
+ sha512 = "a3d010da794cf16d8ddfc14ca50f8504c8063091dc2770eb673281bf52c47faca96f5fce87bba5a691294117e23c46edf5a54b8c8b56d9a57902c088e247142c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ko/thunderbird-60.3.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb";
+ sha512 = "8243d3ae0cb32d8805887d41764f5bc06dab1d2777c32e5d3b3a95dc52755f79e5d11fad4f93553262749a2cc6151462091a3a1228d83c4bda7ab04a6c427b1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/lt/thunderbird-60.3.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5";
+ sha512 = "8c9456bf6add79ef4cfc46b0400a7de4e6ff37e45788e524565bddbbc31152072ed6f10a033d5c77bfcbf46809132e87722dc5b77ac063a63cec6086d630e8d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ms/thunderbird-60.3.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316";
+ sha512 = "a0df7d3fc076370728909e32f9205c98b5c0f14b829148348f02c4f10a20ff21bd3e37ba54784b93f6b577c5710f0c021181146f50119789fbecbf7afd86285f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nb-NO/thunderbird-60.3.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e";
+ sha512 = "b363b84cec28b80b80a89ad0aa91d81952a7503aa985b705cd0f6045f309287d0a3671c96fc871cbc1dc51d62f30d00532914f1e06255e240593dfcf9b7f8ef5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nl/thunderbird-60.3.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1";
+ sha512 = "1f9184da2d2b28649f7051f00e68491694ab19de23a318429ea29dccf9175520dfe1c8fd4ab9040d9b4e8ec2f0b65a884d1c130d3df034193a9c8bb23b23f024";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nn-NO/thunderbird-60.3.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901";
+ sha512 = "f85bbd7f6a3bebe7485c678318183082dc09ac259316d35874eeab67b77358495c2a8a6e01d09364bf4b9da0608b99541704894b78946ddd3e2833694a1a9fe4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pl/thunderbird-60.3.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3";
+ sha512 = "ffa67d8f9f8f923341bc8a9235503af0dd20798e65f406d7aefd4fa30a06371ba265b3b8b67f31ca0792cad09033ef46b7f064d6270c76af9191c3122933bd4d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-BR/thunderbird-60.3.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e";
+ sha512 = "bd92b016722347ae7662e8d44bbe205b8db19a9a3f9c5e537db4e9bf7d84e8bb69ca860d34b2b78219f01c6130ffd8e79aaf842545397766dc1199e1df8af3c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-PT/thunderbird-60.3.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556";
+ sha512 = "f97d92c60f64380ee35c2eb41cc7c494e09b48a367a14ec1f2cf05f6bedda4bfc5014b41d456e0434a328c663e1adefc104b59c2c6366ccbf51c5a6466bb8e09";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/rm/thunderbird-60.3.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837";
+ sha512 = "03ab5b1eef8082489471159786027b8fdca8cadedd396c28e5c00bca31554ba4ce14b8e810b055c9852f1d8964c8b1bd83b34e1a79b840146806ad701ff8a4a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ro/thunderbird-60.3.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd";
+ sha512 = "e7fd6217ecb683dd78ababecb4dc17e7705a04c6761f445b34fffdb32527818f5b71361a8613ef54250956462f305faa59267698c89c6ea64eae2c5bb80c1dc2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ru/thunderbird-60.3.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6";
+ sha512 = "051593bb3f0d0ce571aba9365455d97d392377b482db7fa0efa42a50ae52981c294e84f185abd0dd52a07fcbae852d55f0427ede0f5172632a8dac416ed528a1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/si/thunderbird-60.3.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9";
+ sha512 = "0e859053b989734e1134c365a28a5fdb628fd61125cd6c4d3b7cf598e861dc8b08330ec017c148eda8fd02df49a7688d6b5d7e057ab75b387362dca884c9a90d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sk/thunderbird-60.3.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd";
+ sha512 = "f7d8191bd1f8b78a1a04d669b5193d1067413f3d1f5600940129cf018e38aae85b2c7d274308ca56b2b871d3ec594703d5dde2d5ae12dafee0332ce37393142f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sl/thunderbird-60.3.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c";
+ sha512 = "c6e9ec49518f19bbfb045b85aec4f11e43645a55892cd3e8570f90b0c4fcc90f4e57848ed5419708c5544aa5df93b1a61786ca1422976938795bc7c5c2743098";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sq/thunderbird-60.3.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08";
+ sha512 = "e5586b535c014b400535680964c0ec03ef9a4d9cbd3bea4701293f681635faf6218744d8a8cb8781310ad4797143610ce1821de5c24232e990a24a87a57a7f2e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sr/thunderbird-60.3.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa";
+ sha512 = "7bbd3dd52ed742cc59d474f9235a1370d5cb8d9a805df87fffbc9eb13fa50d3bcba630a720effdfaab42580148a9328ba09869b09d06151eaa5ded55db13cbf3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sv-SE/thunderbird-60.3.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92";
+ sha512 = "157772822f5f28fbbc4fe2b19b38c1cee3e11d7c62c802620e3b3df17898cf61d3c7ffd1e77e2373ddbfd67452e177eabdd34c3a025f7b4bbcb587dc2fa607b2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/tr/thunderbird-60.3.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e";
+ sha512 = "7748d29478930265e632973ccee211d3edef2e5ee5ff363145d57c9bbaf7257e8e963287eb854cce4de16ad976d54305be14bb848e164c9feaf223ad40e1c8e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/uk/thunderbird-60.3.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5";
+ sha512 = "c8cc86f2c802f05131d2ceb2ab3fb1c3fc72c9253efd40833046c2022de61d581222275d84584938a3720f0d20df6eeee4ca50751554fe53fd7551577db0591b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/vi/thunderbird-60.3.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326";
+ sha512 = "81bd7e3276e2b7ad50456d29fc84260b0cd694acaeea6818b0fdfcda91ed0e04b3c03b8721303c5b3a6cb8a7570c5b925922c9d6725a258c525250ff42c076e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-CN/thunderbird-60.3.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246";
+ sha512 = "2d120d666559ce4c0bbb1045d03aaa7c9f851c929b91fd6addc20c3a81ca7accba550f49540e3249ee227caa19aaf24414db995d930f0e02f651d75c230e3429";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-TW/thunderbird-60.3.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f";
+ sha512 = "ad36e3c82d68215765a83cf0098bfc392b2e3f32dbdb7998f54e4b83885f5be53a65cf814990237d7cd35b4695a23f5a4dff363e185b5c75a5aa2248c96ab80e";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 419cc2fd2d8..69540d6092f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "60.2.1";
+ version = "60.3.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp";
+ sha512 = "39sicxgfzfx4dm50nn2l8mimyjpvfigdpmkbxk6lvvbi8xxl527631xxq0gh1di6iyp590vpwk16z7hvdfbqj2pd3231knjkl991hvc";
};
# from firefox, but without sound libraries
@@ -48,14 +48,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
patches = [
- # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
- # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
- (fetchpatch {
- name = "bc651d3d910c.patch";
- url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
- sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
- })
-
# Remove buildconfig.html to prevent a dependency on clang etc.
../../browsers/firefox/no-buildconfig.patch
];
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix
new file mode 100644
index 00000000000..ca8a4d0fb0c
--- /dev/null
+++ b/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, buildEnv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:
+
+stdenv.mkDerivation rec {
+ name = "modem-manager-gui-${version}";
+ version = "0.0.19.1";
+
+ src = fetchhg {
+ url = https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui;
+ rev = "version ${version}";
+ sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";
+ };
+
+ LC_ALL = "en_US.utf-8";
+
+ nativeBuildInputs = [
+ pkgconfig
+ python3
+ perlPackages.Po4a
+ itstool
+ glibcLocales
+ meson
+ ninja
+ ];
+
+ buildInputs = [
+ gtk3
+ glib
+ gdbm
+ gtkspell3
+ libappindicator-gtk3
+ ];
+
+ postPatch = ''
+ patchShebangs man/manhelper.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more";
+ longDescription = ''
+ A simple GTK+ based GUI compatible with Modem manager, Wader and oFono
+ system services able to control EDGE/3G/4G broadband modem specific
+ functions. You can check balance of your SIM card, send or receive SMS
+ messages, control mobile traffic consumption and more.
+ '';
+ homepage = https://linuxonly.ru/page/modem-manager-gui;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ ahuzik ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 77ca7afe871..29ec8158099 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "tribler-${version}";
- version = "7.0.2";
+ version = "7.1.2";
src = fetchurl {
- url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
- sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42";
+ url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.gz";
+ sha256 = "1ayzqx4358qlx56hsnsn5s8xl6mzdb6nw4kwsalmp86dw6vmmis8";
};
buildInputs = [
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
pythonPackages.psutil
pythonPackages.meliae
pythonPackages.sip
+ pythonPackages.pillow
+ pythonPackages.networkx
];
postPatch = ''
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index a4a127db73b..3e74fbfb66a 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
let
- version = "1.0.6-1";
+ version = "1.1.0-1";
description = ''
An application that runs on your computer in the background and seamlessly encrypts
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
- sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28";
+ sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb";
};
nativeBuildInputs = [ makeWrapper ];
@@ -38,10 +38,10 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,lib,share/applications}
- # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+ mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib
- # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
+ cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
cp ${desktopItem}/share/applications/* $out/share/applications
ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index e823977db20..dc17ccc4a37 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, libdbusmenu-gtk3, libappindicator-gtk3
@@ -7,24 +7,11 @@
, openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them.
, hicolor-icon-theme, adwaita-icon-theme
-, gnomeSupport ? true, libgnome-keyring
}:
with stdenv.lib;
-let
-
- desktopItem = makeDesktopItem {
- name = "remmina";
- desktopName = "Remmina";
- genericName = "Remmina Remote Desktop Client";
- exec = "remmina";
- icon = "remmina";
- comment = "Connect to remote desktops";
- categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
- };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "remmina-${version}";
version = "1.2.32";
@@ -35,22 +22,16 @@ in stdenv.mkDerivation rec {
sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
buildInputs = [
- cmake wrapGAppsHook gsettings-desktop-schemas
+ gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libX11
freerdp libssh libgcrypt gnutls
pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
openssl hicolor-icon-theme adwaita-icon-theme json-glib
- ]
- ++ optional gnomeSupport libgnome-keyring;
-
- preConfigure = optionalString (!gnomeSupport) ''
- substituteInPlace CMakeLists.txt \
- --replace "add_subdirectory(remmina-plugins-gnome)" ""
- '';
+ ];
cmakeFlags = [
"-DWITH_VTE=OFF"
@@ -68,13 +49,8 @@ in stdenv.mkDerivation rec {
)
'';
- postInstall = ''
- mkdir -pv $out/share/applications
- cp ${desktopItem}/share/applications/* $out/share/applications
- '';
-
meta = {
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
homepage = https://gitlab.com/Remmina/Remmina;
description = "Remote desktop client written in GTK+";
maintainers = with maintainers; [ melsigl ryantm ];
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 753defb0b4f..5d82b117486 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -17,6 +17,7 @@ let
in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";
+ outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
@@ -87,6 +88,16 @@ in stdenv.mkDerivation {
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
+ mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
+
+ cp config.h $dev/include/
+ cp ../ws_*.h $dev/include
+ cp ../epan/*.h $dev/include/epan/
+ cp ../epan/wmem/*.h $dev/include/epan/wmem/
+ cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
+ cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
+ cp ../wsutil/*.h $dev/include/wsutil/
+ cp ../wiretap/*.h $dev/include/wiretap
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 861e7d24275..2f736dd5856 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -4,6 +4,9 @@
, withTcl ? false, tcl
, withCyrus ? true, cyrus_sasl
, withUnicode ? true, icu
+, withZlib ? true, zlib
+, withIPv6 ? true
+, withDebug ? false
}:
with stdenv.lib;
@@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
++ optional withPython python3
++ optional withTcl tcl
++ optional withCyrus cyrus_sasl
- ++ optional withUnicode icu;
+ ++ optional withUnicode icu
+ ++ optional withZlib zlib;
configureFlags = [
(stdenv.lib.enableFeature withPerl "perl")
@@ -32,7 +36,8 @@ stdenv.mkDerivation rec {
(stdenv.lib.enableFeature withTcl "tcl")
(stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
(stdenv.lib.enableFeature withCyrus "cyrus")
- ];
+ ] ++ optional (!withIPv6) [ "--disable-ipv6" ]
+ ++ optional withDebug [ "--enable-debug" ];
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index a799df2d1ed..42d2093ee3a 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -9,6 +9,8 @@ let
inherit buildPhase;
inherit installPhase;
+ buildInputs = znc.buildInputs;
+
meta = a.meta // { platforms = stdenv.lib.platforms.unix; };
passthru.module_name = module_name;
});
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index 64e2c0b9467..b510fe950a3 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3
+{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "aesop";
- version = "1.0.5";
+ version = "1.0.7";
name = "${pname}-${version}";
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
- vala
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = [
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee
granite
gtk3
@@ -34,14 +35,6 @@ stdenv.mkDerivation rec {
poppler
];
- # Fix build with vala 0.42
- patches = [
- (fetchpatch {
- url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch";
- sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169";
- })
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
@@ -49,9 +42,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The simplest PDF viewer around";
- homepage = https://github.com/lainsce/aesop;
- license = licenses.gpl2Plus;
+ homepage = https://github.com/lainsce/aesop;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index 45c794c82ea..bc2f260c703 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -1,46 +1,70 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3
-, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3
+, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "bookworm";
- version = "1.0.0";
+ version = "4f7b118281667d22f1b3205edf0b775341fa49cb";
- name = "${pname}-${version}";
+ name = "${pname}-2018-10-21";
src = fetchFromGitHub {
owner = "babluboy";
repo = pname;
rev = version;
- sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520";
+ sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
};
+ # See: https://github.com/babluboy/bookworm/pull/220
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch";
+ sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975";
+ })
+ ];
+
nativeBuildInputs = [
- cmake
+ bash
gobjectIntrospection
libxml2
+ meson
ninja
pkgconfig
- vala
+ python3
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = with gnome3; [
glib
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
granite
gtk3
html2text
libgee
poppler
+ python2
sqlite
webkitgtk
];
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ # These programs are expected in PATH from the source code and scripts
preFixup = ''
gappsWrapperArgs+=(
- --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}"
+ --prefix PATH : $out/bin
)
'';
+ postFixup = ''
+ patchShebangs $out/share/bookworm/scripts/mobi_lib/*.py
+ patchShebangs $out/share/bookworm/scripts/tasks/*.sh
+ '';
+
meta = with stdenv.lib; {
description = "A simple, focused eBook reader";
longDescription = ''
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index c94d79a0ced..5dae3c9f85c 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, qtsvg }:
+{ stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }:
let
version = "1.43.27";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h";
};
- nativeBuildInputs = [ qmake ];
+ nativeBuildInputs = [ qmake makeWrapper ];
buildInputs = [ qtsvg ];
hardeningDisable = [ "format" ];
@@ -23,6 +23,11 @@ in stdenv.mkDerivation rec {
--replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
'';
+ postFixup = ''
+ wrapProgram $out/bin/mytetra \
+ --prefix PATH : ${xdg_utils}/bin
+ '';
+
meta = with stdenv.lib; {
description = "Smart manager for information collecting";
homepage = https://webhamster.ru/site/page/index/articles/projectcode/138;
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index 520510698e3..3141223d728 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -12,25 +12,27 @@
, ninja
, libgudev
, libevdev
-, vala
+, libsoup
+, vala_0_40
, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "spice-up-${version}";
- version = "1.3.2";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Spice-up";
rev = version;
- sha256 = "087cdi7na93pgz7vf046h94v5ydvpiccpwhllq85ix8g4pa5rp85";
+ sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq";
};
+
USER = "nix-build-user";
nativeBuildInputs = [
pkgconfig
wrapGAppsHook
- vala
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
cmake
ninja
gettext
@@ -38,12 +40,14 @@ stdenv.mkDerivation rec {
gobjectIntrospection # For setup hook
];
buildInputs = [
- gtk3
- granite
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee
+ granite
+ gtk3
json-glib
- libgudev
libevdev
+ libgudev
+ libsoup
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index a7d93c3b0cb..740224b15b3 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, python3, glibcLocales }:
+{ stdenv, python3, glibcLocales, fetchpatch }:
let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
in
buildPythonApplication rec {
pname = "todoman";
- version = "3.4.0";
+ version = "3.4.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw";
+ sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5";
};
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
@@ -29,9 +29,17 @@ buildPythonApplication rec {
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
"--set CHARSET en_us.UTF-8" ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch";
+ sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag";
+ })
+ ];
+
preCheck = ''
# Remove one failing test that only checks whether the command line works
rm tests/test_main.py
+ rm tests/test_cli.py
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 4b4920a6ca3..3cd83a5cdd2 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -4,8 +4,8 @@ let
hts-nim = fetchFromGitHub {
owner = "brentp";
repo = "hts-nim";
- rev = "9cd83e30522ab64cd71eb8209be4154aa5579ce1";
- sha256 = "10g408idy14667varq1syf06rrbpk63i3ib7i5dh1md4ib19av6f";
+ rev = "v0.2.5";
+ sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb";
};
docopt = fetchFromGitHub {
@@ -28,7 +28,10 @@ in stdenv.mkDerivation rec {
buildInputs = [ nim ];
- buildPhase = "nim -p:${hts-nim}/src -p:${docopt}/src c -d:release mosdepth.nim";
+ buildPhase = ''
+ HOME=$TMPDIR
+ nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim
+ '';
installPhase = "install -Dt $out/bin mosdepth";
fixupPhase = "patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc htslib pcre ]} $out/bin/mosdepth";
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index c552d9f9de3..e22043d9eb9 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "star-${version}";
- version = "2.6.1a";
+ version = "2.6.1c";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc";
+ sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd";
};
sourceRoot = "source/source";
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index c92da3eeb29..5d0165eb6dd 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -13,11 +13,11 @@ with lib;
stdenv.mkDerivation rec {
name = "kicad-${version}";
series = "5.0";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchurl {
url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
- sha256 = "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p";
+ sha256 = "0skig2wdxxc2677m8a8m1xrg3pkhqiqnmkcyr2hv0b2j30rzdr2z";
};
postPatch = ''
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 33eb52c18ee..c0831847b72 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "librepcb-${version}";
- version = "20180628";
+ version = "20181031";
src = fetchFromGitHub {
owner = "LibrePCB";
repo = "LibrePCB";
fetchSubmodules = true;
- rev = "68577ecf8f39299ef4d81ff964b01c3908d1f10b";
- sha256 = "1ca4q8b8fhp19vq5yi55sq6xlsz14ihw3i0h7rq5fw0kigpjldmz";
+ rev = "3cf8dba9fa88e5b392d639c9fdbcf3a44664170a";
+ sha256 = "0kr4mii5w3kj3kqvhgq7zjxjrq44scx8ky0x77gyqmwvwfwk7nmx";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index b787a4e7a01..729aef4e21c 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,57 +1,27 @@
-{ stdenv, fetchurl, ocamlPackages,
- buildBytecode ? true,
- buildNative ? true,
- installExamples ? true,
- installEmacsMode ? true }:
-
-let inherit (stdenv.lib) versionAtLeast optionalString; in
-
-let inherit (ocamlPackages) ocaml camlp4; in
-
-assert buildBytecode || buildNative;
+{ stdenv, fetchurl, dune, ocamlPackages }:
stdenv.mkDerivation {
- name = "acgtk-1.3.1";
+ name = "acgtk-1.5.0";
src = fetchurl {
- url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz;
- sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq";
+ url = http://calligramme.loria.fr/acg/software/acg-1.5.0-20181019.tar.gz;
+ sha256 = "14n003gxzw5w79hlpw1ja4nq97jqf9zqyg00ihvpxw4bv9jlm8jm";
};
- buildInputs = with ocamlPackages; [
- ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson
- ];
+ buildInputs = [ dune ] ++ (with ocamlPackages; [
+ ocaml findlib ansiterminal cairo2 fmt logs menhir mtime ocf
+ ]);
- patches = [ ./install-emacs-to-site-lisp.patch
- ./use-nix-ocaml-byteflags.patch ];
+ buildPhase = "dune build";
- postPatch = optionalString (camlp4 != null) ''
- substituteInPlace src/Makefile.master.in \
- --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
- '' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") ''
- substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma
- '';
-
- # The bytecode executable is dependent on the dynamic library provided by
- # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
- # -rpath) to make sure that ocamlrun is able to link the library at
- # runtime and that Nix detects a runtime dependency.
- NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal";
-
- buildFlags = optionalString buildBytecode "byte"
- + " "
- + optionalString buildNative "opt";
-
- installTargets = "install"
- + " " + optionalString installExamples "install-examples"
- + " " + optionalString installEmacsMode "install-emacs";
+ inherit (dune) installPhase;
meta = with stdenv.lib; {
homepage = http://calligramme.loria.fr/acg/;
description = "A toolkit for developing ACG signatures and lexicon";
license = licenses.cecill20;
- platforms = ocaml.meta.platforms or [];
+ inherit (ocamlPackages.ocaml.meta) platforms;
maintainers = [ maintainers.jirkamarsik ];
};
}
diff --git a/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch b/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch
deleted file mode 100644
index 43ddd20b4a3..00000000000
--- a/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- acg-1.1-20140905/Makefile.in 2014-10-24 15:21:39.442287208 +0200
-+++ acg-1.1-20140905/Makefile.in.new 2014-10-24 15:24:58.557117228 +0200
-@@ -35,6 +35,7 @@
- ACGC_DIR=src/acg-data
-
- DATA_DIR=@datarootdir@/acgtk
-+EMACS_DIR=@prefix@/share/emacs/site-lisp
-
-
-
-@@ -82,10 +83,10 @@
- rm -r $(DATA_DIR)
-
- install-emacs:
-- mkdir -p $(DATA_DIR) && cp -r emacs $(DATA_DIR)/.
-+ mkdir -p $(EMACS_DIR) && cp emacs/acg.el $(EMACS_DIR)
-
- uninstall-emacs:
-- rm -rf $(DATA_DIR)/emacs
-+ rm -rf $(EMACS_DIR)/emacs
-
- install-examples:
- mkdir -p $(DATA_DIR) && cp -r examples $(DATA_DIR)/.
diff --git a/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch b/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch
deleted file mode 100644
index 26ade37e452..00000000000
--- a/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acg-1.1-20140905/src/Makefile.master.in 2014-10-27 10:59:42.263382081 +0100
-+++ acg-1.1-20140905/src/Makefile.master.in.new 2014-10-27 10:59:59.683597972 +0100
-@@ -23,7 +23,7 @@
- # All warnings are treated as errors
- WARNINGS = @OCAML09WARNINGS@ -warn-error A
- COMMONFLAGS= $(WARNINGS) @TYPES@
--BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG)
-+BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG) $(NIX_OCAML_BYTEFLAGS)
- OPTFLAGS = $(COMMONFLAGS)
- LFLAGS= -a
-
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index 5b99a47bb41..0817ebe0654 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -1,5 +1,13 @@
{ stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib,
- buildPlatform, buildPackages, ghcWithPackages }:
+ buildPlatform, buildPackages, ghcWithPackages, fetchpatch }:
+let
+ options-patch =
+ fetchpatch {
+ url = https://github.com/cedille/cedille/commit/ee62b0fabde6c4f7299a3778868519255cc4a64f.patch;
+ name = "options.patch";
+ sha256 = "19xzn9sqpfnfqikqy1x9lb9mb6722kbgvrapl6cf8ckcw8cfj8cz";
+ };
+in
stdenv.mkDerivation rec {
version = "1.0.0";
name = "cedille-${version}";
@@ -11,6 +19,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ];
+ patches = [options-patch];
+
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE =
lib.optionalString (buildPlatform.libc == "glibc")
@@ -22,9 +32,12 @@ stdenv.mkDerivation rec {
chmod -R 755 ial
'';
+ outputs = ["out" "lib"];
+
installPhase = ''
mkdir -p $out/bin
mv cedille $out/bin/cedille
+ mv lib $lib
'';
meta = {
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
deleted file mode 100644
index c3da1205ab0..00000000000
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-# - 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, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
-
-let
- version = "8.4pl6";
- coq-version = "8.4";
- buildIde = lablgtk != null;
- ideFlags = if buildIde then "-lablgtkdir ${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 "";
-
-self =
-stdenv.mkDerivation {
- name = "coq-${version}";
-
- inherit coq-version;
- inherit ocaml camlp5;
-
- src = fetchurl {
- url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
- sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
-
- patches = [ ./configure.patch ];
-
- postPatch = ''
- UNAME=$(type -tp uname)
- RM=$(type -tp rm)
- substituteInPlace configure --replace "/bin/uname" "$UNAME"
- substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
- ${csdpPatch}
- '';
-
- preConfigure = ''
- configureFlagsArray=(
- -opt
- -camldir ${ocaml}/bin
- -camlp5dir $(ocamlfind query camlp5)
- ${ideFlags}
- )
- '';
-
- prefixKey = "-prefix ";
-
- buildFlags = "revision coq coqide";
-
- 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
- }
-
- addEnvHooks "$targetOffset" addCoqPath
- '';
-
- passthru = {
- inherit findlib;
- emacsBufferSetup = pkgs: ''
- ; Propagate coq paths to children
- (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
- (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep")
- (inherit-local-permanent coq-compiler "${self}/bin/coqc")
- ; If the coq-library path was already set, re-set it based on our current coq
- (when (fboundp 'get-coq-library-directory)
- (inherit-local-permanent coq-library-directory (get-coq-library-directory))
- (coq-prog-args))
- (mapc (lambda (arg)
- (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib"))
- (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
- '';
- };
-
- meta = with stdenv.lib; {
- description = "Formal proof management system";
- 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;
- };
-}; in self
diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch
deleted file mode 100644
index aa38ce06e92..00000000000
--- a/pkgs/applications/science/logic/coq/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure
---- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100
-+++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100
-@@ -395,7 +395,6 @@
- ocamlyaccexec=$CAMLBIN/ocamlyacc
- ocamlmktopexec=$CAMLBIN/ocamlmktop
- ocamlmklibexec=$CAMLBIN/ocamlmklib
-- camlp4oexec=$CAMLBIN/camlp4o
- esac
-
- if test ! -f "$CAMLC" ; then
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 040d722f941..5fab9788a94 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -25,6 +25,7 @@ let
"8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
"8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
+ "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8";
}."${version}";
coq-version = builtins.substring 0 3 version;
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 3121a83e5b9..0ab08db6746 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yices-${version}";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchurl {
url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
name = "${name}-src.tar.gz";
- sha256 = "10ikq7ib8jhx7hlxfm6mp5qg6r8dflqs8242q5zaicn80qixpm12";
+ sha256 = "14xvflv14qn8ssm8rklvckp6l1q94vn49qz2snz73j40nwzshaww";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 1cbe914779e..f7d67d82cbc 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "z3-${version}";
- version = "4.7.1";
+ version = "4.8.1";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
- rev = "3b1b82bef05a1b5fd69ece79c80a95fb6d72a990";
- sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d";
+ rev = name;
+ sha256 = "1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f";
};
buildInputs = [ python fixDarwinDylibNames ];
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index cac403b131b..bba08e3ae29 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -7,49 +7,39 @@
, gnome3
, cmake
, ninja
-, vala
+, vala_0_40
, libqalculate
, gobjectIntrospection
, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "nasc-${version}";
- version = "0.4.7";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "parnold-x";
repo = "nasc";
rev = version;
- sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa";
+ sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9";
};
- patches = [
- # Install libqalculatenasc.so
- (fetchpatch {
- url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch;
- sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631";
- })
- (fetchpatch {
- url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch;
- sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka";
- })
- ];
-
nativeBuildInputs = [
pkgconfig
wrapGAppsHook
- vala
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
cmake
ninja
gobjectIntrospection # for setup-hook
];
+
buildInputs = [
- libqalculate
- gtk3
- granite
+ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+ gnome3.gtksourceview
gnome3.libgee
gnome3.libsoup
- gnome3.gtksourceview
+ granite
+ gtk3
+ libqalculate
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
index 2a7dc13756d..8cd80281d0e 100644
--- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
@@ -1,14 +1,14 @@
-From c8edfefbbec87ca776d3cf84ee895aac200dda40 Mon Sep 17 00:00:00 2001
+From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001
From: Timo Kaufmann
Date: Sun, 21 Oct 2018 17:52:40 +0200
Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested
---
- src/sage/doctest/control.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/sage/doctest/control.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
-index bf18df8b2b..b04af0e2e8 100644
+index bf18df8b2b..935c67abf7 100644
--- a/src/sage/doctest/control.py
+++ b/src/sage/doctest/control.py
@@ -362,7 +362,8 @@ class DocTestController(SageObject):
@@ -21,6 +21,15 @@ index bf18df8b2b..b04af0e2e8 100644
self.options = options
+@@ -765,7 +766,7 @@ class DocTestController(SageObject):
+ sage: DC = DocTestController(DD, [dirname])
+ sage: DC.expand_files_into_sources()
+ sage: sorted(DC.sources[0].options.optional) # abs tol 1
+- ['guava', 'magma', 'py2']
++ ['guava', 'magma']
+
+ We check that files are skipped appropriately::
+
--
2.18.1
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index b86f9d1aa0d..f631fe38a5b 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -58,6 +58,13 @@ stdenv.mkDerivation rec {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
})
+
+ # https://trac.sagemath.org/ticket/26360
+ (fetchpatch {
+ name = "arb-2.15.1.patch";
+ url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31";
+ sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30";
+ })
];
patches = nixPatches ++ packageUpgradePatches ++ [
diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix
index 06b667f426f..4b2f9c461c1 100644
--- a/pkgs/applications/science/math/sage/sage-wrapper.nix
+++ b/pkgs/applications/science/math/sage/sage-wrapper.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
version = sage.version;
- name = "sage-wrapper-${version}";
+ name = "sage-${version}";
buildInputs = [
makeWrapper
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index b1e5d7278b0..ad9a32e0ca5 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = sage-with-env.version;
- name = "sage-${version}";
+ name = "sage-tests-${version}";
buildInputs = [
makeWrapper
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index b6cd8c294c1..258073e4080 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
name = "simgrid-${version}";
- version = "3.20";
+ version = "3.21";
src = fetchFromGitHub {
owner = "simgrid";
repo = "simgrid";
- rev = "v${version}";
- sha256 = "0xb20qhvsah2dz2hvn850i3w9a5ghsbcx8vka2ap6xsdkxf593gy";
+ rev = "v${replaceChars ["."] ["_"] version}";
+ sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs";
};
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
@@ -107,6 +107,6 @@ stdenv.mkDerivation rec {
homepage = http://simgrid.gforge.inria.fr/;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ mickours ];
- platforms = platforms.x86_64;
+ platforms = ["x86_64-linux"];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 5ae10dd68b6..6661b4aa228 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -57,6 +57,8 @@ let
git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
+ git-bug = callPackage ./git-bug { };
+
# support for bugzilla
git-bz = callPackage ./git-bz { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 6918f048eae..7a47ed9a992 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -2,7 +2,7 @@
python2Packages.buildPythonApplication rec {
pname = "git-big-picture";
- version = "0.9.0";
+ version = "0.10.1";
name = "${pname}-${version}";
@@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
owner = "esc";
repo = pname;
rev = "v${version}";
- sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9";
+ sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi";
};
buildInputs = [ git graphviz ];
@@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec {
'';
meta = {
- description = "Tool for visualization of Git repositories.";
+ description = "Tool for visualization of Git repositories";
homepage = https://github.com/esc/git-big-picture;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
new file mode 100644
index 00000000000..eabc9258e29
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "git-bug-${version}";
+ version = "0.4.0";
+ rev = "2ab2412771d58a1b1f3bfeb5a6e9da2e683b0e12";
+ goPackagePath = "github.com/MichaelMure/git-bug";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "MichaelMure";
+ repo = "git-bug";
+ sha256 = "1zyvyg0p5h71wvyxrzkr1bwddxm3x8p44n6wh9ccfdxp8d2k6k25";
+ };
+
+ goDeps = ./deps.nix;
+
+ postInstall = ''
+ cd go/src/${goPackagePath}
+ install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug"
+ install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug"
+ install -D -m 0644 -t "$bin/share/man/man1" doc/man/*
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Distributed bug tracker embedded in Git";
+ homepage = https://github.com/MichaelMure/git-bug;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ royneary ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix
new file mode 100644
index 00000000000..77d79602a9c
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix
@@ -0,0 +1,417 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "github.com/99designs/gqlgen";
+ fetch = {
+ type = "git";
+ url = "https://github.com/99designs/gqlgen";
+ rev = "636435b68700211441303f1a5ed92f3768ba5774";
+ sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz";
+ };
+ }
+ {
+ goPackagePath = "github.com/agnivade/levenshtein";
+ fetch = {
+ type = "git";
+ url = "https://github.com/agnivade/levenshtein";
+ rev = "3d21ba515fe27b856f230847e856431ae1724adc";
+ sha256 = "0dym3k3ycsj0zj0p4dhdp7gd2hm7c7pyh2wii1mdbmpdyipy99cd";
+ };
+ }
+ {
+ goPackagePath = "github.com/cheekybits/genny";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cheekybits/genny";
+ rev = "9127e812e1e9e501ce899a18121d316ecb52e4ba";
+ sha256 = "1z57ga9c2sjnl5ngqgb1ap0zqv36sk0rarm02bbbkipz4m9yabjg";
+ };
+ }
+ {
+ goPackagePath = "github.com/corpix/uarand";
+ fetch = {
+ type = "git";
+ url = "https://github.com/corpix/uarand";
+ rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4";
+ sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn";
+ };
+ }
+ {
+ goPackagePath = "github.com/cpuguy83/go-md2man";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
+ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-test/deep";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-test/deep";
+ rev = "6592d9cc0a499ad2d5f574fde80a2b5c5cc3b4f5";
+ sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/context";
+ rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+ sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/mux";
+ rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
+ sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
+ sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+ };
+ }
+ {
+ goPackagePath = "github.com/icrowley/fake";
+ fetch = {
+ type = "git";
+ url = "https://github.com/icrowley/fake";
+ rev = "4178557ae428460c3780a381c824a1f3aceb6325";
+ sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jroimartin/gocui";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jroimartin/gocui";
+ rev = "c055c87ae801372cd74a0839b972db4f7697ae5f";
+ sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+ sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8";
+ sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
+ };
+ }
+ {
+ goPackagePath = "github.com/nsf/termbox-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nsf/termbox-go";
+ rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3";
+ sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
+ };
+ }
+ {
+ goPackagePath = "github.com/phayes/freeport";
+ fetch = {
+ type = "git";
+ url = "https://github.com/phayes/freeport";
+ rev = "b8543db493a5ed890c5499e935e2cad7504f3a04";
+ sha256 = "1gwaan8fwmc5lfx4dzymq0jd6z2l1frg83jkmjpm4kw8ay4vr11q";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
+ sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/githubv4";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/githubv4";
+ rev = "b5f70540eee0ebfb6a27b52fc5b131be76415539";
+ sha256 = "0hrjk16l8jwkhrbzcasp4dflv6hl24hcc4q2md5rn6i8f73dl18h";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/go";
+ rev = "9e1955d9fb6e1ee2345ba1f5e71669263e719e27";
+ sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/graphql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/graphql";
+ rev = "365899397c9ad12805631fe4c9b2a64be9d74818";
+ sha256 = "10n4id76zpj5g4hr1ry8d9v5cvm039rygrpgdk4ygk198vhr0gwm";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/httpfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/httpfs";
+ rev = "809beceb23714880abc4a382a00c05f89d13b1cc";
+ sha256 = "1hvj5q5kjw83z7f77y03fqfg7fps7pqj2cj2c38x752m0pq4j2w3";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/vfsgen";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/vfsgen";
+ rev = "62bca832be04bd2bcaabd3b68a6b19a7ec044411";
+ sha256 = "1lh8sw7qxs43jj8k9pfn91kfy2033p3il9bcb63whz8zhqw2a16y";
+ };
+ }
+ {
+ goPackagePath = "github.com/skratchdot/open-golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/skratchdot/open-golang";
+ rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
+ sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+ sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ };
+ }
+ {
+ goPackagePath = "github.com/vektah/gqlgen";
+ fetch = {
+ type = "git";
+ url = "https://github.com/vektah/gqlgen";
+ rev = "636435b68700211441303f1a5ed92f3768ba5774";
+ sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz";
+ };
+ }
+ {
+ goPackagePath = "github.com/vektah/gqlparser";
+ fetch = {
+ type = "git";
+ url = "https://github.com/vektah/gqlparser";
+ rev = "14e83ae06ec152e6d0afb9766a00e0c0918aa8fc";
+ sha256 = "162j259402pa2wb4645z6gplx5g1a2sfk393k2svwgws3bg2bws2";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "0e37d006457bf46f9e6692014ba72ef82c33022c";
+ sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908";
+ sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9";
+ sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+ sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "a434f64ace81347eff0fb4a32bc80a235e0ad762";
+ sha256 = "0zngnxrxjync4caz6ikmv5v0cn895iqhqmzqg9qddfm5bvl2a2my";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
+ sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+ {
+ goPackagePath = "gotest.tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gotestyourself/gotest.tools";
+ rev = "b6e20af1ed078cd01a6413b734051a292450b4cb";
+ sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 962ddf98d6c..dd080799557 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGo19Package, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
let
- version = "0.2.0";
+ version = "0.3.0";
in
buildGo19Package {
name = "grv-${version}";
@@ -14,10 +14,14 @@ buildGo19Package {
owner = "rgburke";
repo = "grv";
rev = "v${version}";
- sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a";
+ sha256 = "00v502mwnpv09l7fsbq3s72i5fz5dxbildwxgw0r8zzf6d54xrgl";
fetchSubmodules = true;
};
+ postPatch = ''
+ rm util/update_latest_release.go
+ '';
+
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 113d7f78b90..e01101c6a66 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hub-${version}";
- version = "2.5.1";
+ version = "2.6.0";
goPackagePath = "github.com/github/hub";
@@ -10,10 +10,11 @@ buildGoPackage rec {
owner = "github";
repo = "hub";
rev = "v${version}";
- sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg";
+ sha256 = "0hxmbpyv2yjxg4v3z50x5ikgcz7mgv5prya8jcpi277vq2s0wwa1";
};
- buildInputs = [ groff ronn ruby utillinux ] ++
+ nativeBuildInputs = [ groff ronn utillinux ];
+ buildInputs = [ ruby ] ++
stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
@@ -29,7 +30,7 @@ buildGoPackage rec {
install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish"
make man-pages
- cp -r share/man $bin/share/man
+ cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 9523059b42f..88bd0b9f10d 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.125.0";
+ version = "0.125.1";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi";
+ sha256 = "0vbxjqjs1r5c350r67812andasby5zk25xlaqp201lmlvamiv0ni";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 58cfa186260..a25492e4546 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -39,7 +39,7 @@ buildGoPackage rec {
postInstall = ''
mkdir $data
- cp -R $src/{public,templates} $data
+ cp -R $src/{public,templates,options} $data
mkdir -p $out
cp -R $src/options/locale $out/locale
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 16acf2a91d7..3fab965bf54 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchFromGitLab, git, go }:
+
stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}";
- version = "6.1.1";
+ version = "7.0.0";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr";
+ sha256 = "1mmfb7h5sbva2kv9h9cxfg7dyksxrwwikq7jwggfawqaadzwm677";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index c1a4392ec0e..c1c4d20feac 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,29 +11,29 @@ let
groups = [ "default" "unicorn" "ed25519" "metrics" ];
};
- version = "11.3.4";
+ version = "11.4.4";
sources = if gitlabEnterprise then {
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
- sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd";
+ sha256 = "15lpcdjcw6lpmzlhqnpd6pgaxh7wvx2mldjd1vqr414r4bcnhgy4";
};
gitlab = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-ee";
rev = "v${version}-ee";
- sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4";
+ sha256 = "046hchr7q4jnx3j4yxg3rdixfzlva35al3ci26pf9vxrbbl5y8cg";
};
} else {
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
- sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7";
+ sha256 = "02p7azyjgb984bk491q6f4zk1mikbcd38rif08kl07bjjzzkir81";
};
gitlab = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-ce";
rev = "v${version}";
- sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c";
+ sha256 = "1hq9iyp0xrxwmncn61ja3pdj9h2hmdy1l63d1ic3r1dyacybaf2g";
};
};
@@ -63,17 +63,7 @@ stdenv.mkDerivation rec {
--replace "ps -U" "${procps}/bin/ps -U"
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
-
- # required for some gems:
- cat > config/database.yml <
- database: gitlab
- host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %>
- password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %>
- username: gitlab
- encoding: utf8
- EOF
+ sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
'';
buildPhase = ''
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index f14e05d43e0..ecbfba0827d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
# Git Wiki
-# Required manually in config/initializers/gollum.rb to control load order
+# Only used to compute wiki page slugs
gem 'gitlab-gollum-lib', '~> 4.2', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-
# Language detection
gem 'github-linguist', '~> 5.3.3', require: 'linguist'
# API
-gem 'grape', '~> 1.0'
+gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
@@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8'
gem 'carrierwave', '= 1.2.3'
gem 'mini_magick'
-# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
-
# for backups
gem 'fog-aws', '~> 2.0.1'
gem 'fog-core', '~> 1.44'
@@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7'
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.6.4'
+gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
@@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
-gem 'sidekiq', '~> 5.1'
+gem 'sidekiq', '~> 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
gem 'redis-namespace', '~> 1.6.0'
-gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
gem 'rufus-scheduler', '~> 3.4'
@@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
# Metrics
group :metrics do
@@ -425,7 +420,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
gem 'grpc', '~> 1.11.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index e41719ec79d..9837a195d8c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.1)
+ bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -133,14 +133,14 @@ GEM
concurrent-ruby (1.0.5)
concurrent-ruby-ext (1.0.5)
concurrent-ruby (= 1.0.5)
- connection_pool (2.2.1)
+ connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
creole (0.5.0)
css_parser (1.5.0)
addressable
- daemons (1.2.3)
+ daemons (1.2.6)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
@@ -175,8 +175,6 @@ GEM
doorkeeper-openid_connect (1.5.0)
doorkeeper (~> 4.3)
json-jwt (~> 1.6)
- dropzonejs-rails (0.7.2)
- rails (> 3.1)
ed25519 (1.2.4)
email_reply_trimmer (0.1.6)
email_spec (2.2.0)
@@ -189,7 +187,7 @@ GEM
escape_utils (1.1.1)
et-orbi (1.0.3)
tzinfo
- eventmachine (1.0.8)
+ eventmachine (1.2.7)
excon (0.62.0)
execjs (2.6.0)
expression_parser (0.9.0)
@@ -276,7 +274,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.117.0)
+ gitaly-proto (0.118.1)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
@@ -297,15 +295,14 @@ GEM
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
- gitlab-gollum-rugged_adapter (0.4.4.1)
- mime-types (>= 1.15)
- rugged (~> 0.25)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-markup (1.6.4)
+ gitlab-sidekiq-fetcher (0.3.0)
+ sidekiq (~> 5)
gitlab-styles (2.4.1)
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
@@ -343,7 +340,7 @@ GEM
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
- grape (1.0.3)
+ grape (1.1.0)
activesupport
builder
mustermann-grape (~> 1.0.0)
@@ -493,7 +490,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_magick (4.8.0)
- mini_mime (1.0.0)
+ mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
@@ -501,7 +498,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
- mustermann (1.0.2)
+ mustermann (1.0.3)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)
@@ -605,10 +602,6 @@ GEM
atomic (>= 1.0.0)
peek
redis
- peek-sidekiq (1.0.3)
- atomic (>= 1.0.0)
- peek
- sidekiq
pg (0.18.4)
po_to_json (1.0.1)
json (>= 1.6.0)
@@ -633,9 +626,9 @@ GEM
pry-byebug (3.4.3)
byebug (>= 9.0, < 9.1)
pry (~> 0.10)
- pry-rails (0.3.5)
- pry (>= 0.9.10)
- public_suffix (3.0.2)
+ pry-rails (0.3.6)
+ pry (>= 0.10.4)
+ public_suffix (3.0.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.10)
rack-accept (0.4.5)
@@ -649,7 +642,7 @@ GEM
httpclient (>= 2.4)
multi_json (>= 1.3.6)
rack (>= 1.1)
- rack-protection (2.0.1)
+ rack-protection (2.0.3)
rack
rack-proxy (0.6.0)
rack
@@ -735,7 +728,7 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.2.1)
+ rouge (3.3.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -843,16 +836,13 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.1.3)
- concurrent-ruby (~> 1.0)
- connection_pool (~> 2.2, >= 2.2.0)
+ sidekiq (5.2.1)
+ connection_pool (~> 2.2, >= 2.2.2)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
- sidekiq-limit_fetch (3.4.0)
- sidekiq (>= 4)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
@@ -865,7 +855,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slack-notifier (1.5.1)
- spring (2.0.1)
+ spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
@@ -895,7 +885,7 @@ GEM
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
- thin (1.7.0)
+ thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
@@ -954,7 +944,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpack-rails (0.9.10)
+ webpack-rails (0.9.11)
railties (>= 3.2.0)
wikicloth (0.8.1)
builder
@@ -1013,7 +1003,6 @@ DEPENDENCIES
diffy (~> 3.1.0)
doorkeeper (~> 4.3)
doorkeeper-openid_connect (~> 1.5)
- dropzonejs-rails (~> 0.7.1)
ed25519 (~> 1.2)
email_reply_trimmer (~> 0.1)
email_spec (~> 2.2.0)
@@ -1038,19 +1027,20 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.117.0)
+ gitaly-proto (~> 0.118.1)
github-linguist (~> 5.3.3)
+ github-markup (~> 1.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)
- gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-markup (~> 1.6.4)
+ gitlab-sidekiq-fetcher
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (= 3.5.1)
gpgme
- grape (~> 1.0)
+ grape (~> 1.1)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)
@@ -1114,7 +1104,6 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
@@ -1166,9 +1155,8 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
- sidekiq (~> 5.1)
+ sidekiq (~> 5.2.1)
sidekiq-cron (~> 0.6.0)
- sidekiq-limit_fetch (~> 3.4)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 65aac989103..ee262b6b5d9 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -301,10 +301,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
+ sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
type = "gem";
};
- version = "1.3.1";
+ version = "1.3.2";
};
bootstrap_form = {
source = {
@@ -504,10 +504,10 @@
connection_pool = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
+ sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
type = "gem";
};
- version = "2.2.1";
+ version = "2.2.2";
};
crack = {
dependencies = ["safe_yaml"];
@@ -546,10 +546,10 @@
daemons = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+ sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
type = "gem";
};
- version = "1.2.3";
+ version = "1.2.6";
};
database_cleaner = {
source = {
@@ -695,15 +695,6 @@
};
version = "1.5.0";
};
- dropzonejs-rails = {
- dependencies = ["rails"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
- type = "gem";
- };
- version = "0.7.2";
- };
ed25519 = {
source = {
remotes = ["https://rubygems.org"];
@@ -773,10 +764,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
- version = "1.0.8";
+ version = "1.2.7";
};
excon = {
source = {
@@ -1078,10 +1069,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
+ sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
type = "gem";
};
- version = "0.117.0";
+ version = "0.118.1";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1118,15 +1109,6 @@
};
version = "4.2.7.5";
};
- gitlab-gollum-rugged_adapter = {
- dependencies = ["mime-types" "rugged"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
- type = "gem";
- };
- version = "0.4.4.1";
- };
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
@@ -1144,6 +1126,15 @@
};
version = "1.6.4";
};
+ gitlab-sidekiq-fetcher = {
+ dependencies = ["sidekiq"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
@@ -1237,10 +1228,10 @@
dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
+ sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
grape-entity = {
dependencies = ["activesupport" "multi_json"];
@@ -1779,10 +1770,10 @@
mini_mime = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
+ sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
mini_portile2 = {
source = {
@@ -1843,10 +1834,10 @@
mustermann = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
+ sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
mustermann-grape = {
dependencies = ["mustermann"];
@@ -2207,15 +2198,6 @@
};
version = "1.2.0";
};
- peek-sidekiq = {
- dependencies = ["atomic" "peek" "sidekiq"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x";
- type = "gem";
- };
- version = "1.0.3";
- };
pg = {
source = {
remotes = ["https://rubygems.org"];
@@ -2314,18 +2296,18 @@
dependencies = ["pry"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6";
+ sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
type = "gem";
};
- version = "0.3.5";
+ version = "0.3.6";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
pyu-ruby-sasl = {
source = {
@@ -2382,10 +2364,10 @@
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
+ sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp";
type = "gem";
};
- version = "2.0.1";
+ version = "2.0.3";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2699,10 +2681,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+ sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.0";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -3072,13 +3054,13 @@
version = "3.1.2";
};
sidekiq = {
- dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack-protection" "redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
+ sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j";
type = "gem";
};
- version = "5.1.3";
+ version = "5.2.1";
};
sidekiq-cron = {
dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3089,15 +3071,6 @@
};
version = "0.6.0";
};
- sidekiq-limit_fetch = {
- dependencies = ["sidekiq"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
- type = "gem";
- };
- version = "3.4.0";
- };
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
@@ -3144,10 +3117,10 @@
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x";
+ sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
type = "gem";
};
- version = "2.0.1";
+ version = "2.0.2";
};
spring-commands-rspec = {
dependencies = ["spring"];
@@ -3288,10 +3261,10 @@
dependencies = ["daemons" "eventmachine" "rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
+ sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
type = "gem";
};
- version = "1.7.0";
+ version = "1.7.2";
};
thor = {
source = {
@@ -3518,10 +3491,10 @@
dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv";
+ sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
type = "gem";
};
- version = "0.9.10";
+ version = "0.9.11";
};
wikicloth = {
dependencies = ["builder" "expression_parser" "rinku"];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index 86502db9d26..ef14aace277 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
# Git Wiki
-# Required manually in config/initializers/gollum.rb to control load order
+# Only used to compute wiki page slugs
gem 'gitlab-gollum-lib', '~> 4.2', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-
# Language detection
gem 'github-linguist', '~> 5.3.3', require: 'linguist'
# API
-gem 'grape', '~> 1.0'
+gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
@@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8'
gem 'carrierwave', '= 1.2.3'
gem 'mini_magick'
-# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
-
# for backups
gem 'fog-aws', '~> 2.0.1'
gem 'fog-core', '~> 1.44'
@@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4'
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.6.4'
+gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
@@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
-gem 'sidekiq', '~> 5.1'
+gem 'sidekiq', '~> 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
gem 'redis-namespace', '~> 1.6.0'
-gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
gem 'rufus-scheduler', '~> 3.4'
@@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
# Metrics
group :metrics do
@@ -440,7 +435,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
gem 'grpc', '~> 1.11.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index d7c4f80efd1..4355b3ae271 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.1)
+ bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -141,14 +141,14 @@ GEM
concurrent-ruby (1.0.5)
concurrent-ruby-ext (1.0.5)
concurrent-ruby (= 1.0.5)
- connection_pool (2.2.1)
+ connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
creole (0.5.0)
css_parser (1.5.0)
addressable
- daemons (1.2.3)
+ daemons (1.2.6)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
@@ -183,8 +183,6 @@ GEM
doorkeeper-openid_connect (1.5.0)
doorkeeper (~> 4.3)
json-jwt (~> 1.6)
- dropzonejs-rails (0.7.2)
- rails (> 3.1)
ed25519 (1.2.4)
elasticsearch (5.0.3)
elasticsearch-api (= 5.0.3)
@@ -210,7 +208,7 @@ GEM
escape_utils (1.1.1)
et-orbi (1.0.3)
tzinfo
- eventmachine (1.0.8)
+ eventmachine (1.2.7)
excon (0.62.0)
execjs (2.6.0)
expression_parser (0.9.0)
@@ -300,7 +298,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.117.0)
+ gitaly-proto (0.118.1)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
@@ -321,9 +319,6 @@ GEM
rouge (~> 3.1)
sanitize (~> 4.6.4)
stringex (~> 2.6)
- gitlab-gollum-rugged_adapter (0.4.4.1)
- mime-types (>= 1.15)
- rugged (~> 0.25)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
@@ -331,6 +326,8 @@ GEM
posix-spawn (~> 0.3)
gitlab-license (1.0.0)
gitlab-markup (1.6.4)
+ gitlab-sidekiq-fetcher (0.3.0)
+ sidekiq (~> 5)
gitlab-styles (2.4.1)
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
@@ -368,7 +365,7 @@ GEM
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
- grape (1.0.3)
+ grape (1.1.0)
activesupport
builder
mustermann-grape (~> 1.0.0)
@@ -521,7 +518,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_magick (4.8.0)
- mini_mime (1.0.0)
+ mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
@@ -529,7 +526,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
- mustermann (1.0.2)
+ mustermann (1.0.3)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)
@@ -634,10 +631,6 @@ GEM
atomic (>= 1.0.0)
peek
redis
- peek-sidekiq (1.0.3)
- atomic (>= 1.0.0)
- peek
- sidekiq
pg (0.18.4)
po_to_json (1.0.1)
json (>= 1.6.0)
@@ -662,9 +655,9 @@ GEM
pry-byebug (3.4.3)
byebug (>= 9.0, < 9.1)
pry (~> 0.10)
- pry-rails (0.3.5)
- pry (>= 0.9.10)
- public_suffix (3.0.2)
+ pry-rails (0.3.6)
+ pry (>= 0.10.4)
+ public_suffix (3.0.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.10)
rack-accept (0.4.5)
@@ -678,7 +671,7 @@ GEM
httpclient (>= 2.4)
multi_json (>= 1.3.6)
rack (>= 1.1)
- rack-protection (2.0.1)
+ rack-protection (2.0.3)
rack
rack-proxy (0.6.0)
rack
@@ -764,7 +757,7 @@ GEM
retriable (3.1.2)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.2.1)
+ rouge (3.3.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -872,16 +865,13 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.1.3)
- concurrent-ruby (~> 1.0)
- connection_pool (~> 2.2, >= 2.2.0)
+ sidekiq (5.2.1)
+ connection_pool (~> 2.2, >= 2.2.2)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
- sidekiq-limit_fetch (3.4.0)
- sidekiq (>= 4)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
@@ -894,7 +884,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slack-notifier (1.5.1)
- spring (2.0.1)
+ spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
@@ -924,7 +914,7 @@ GEM
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
- thin (1.7.0)
+ thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
@@ -983,7 +973,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpack-rails (0.9.10)
+ webpack-rails (0.9.11)
railties (>= 3.2.0)
wikicloth (0.8.1)
builder
@@ -1043,7 +1033,6 @@ DEPENDENCIES
diffy (~> 3.1.0)
doorkeeper (~> 4.3)
doorkeeper-openid_connect (~> 1.5)
- dropzonejs-rails (~> 0.7.1)
ed25519 (~> 1.2)
elasticsearch-api (= 5.0.3)
elasticsearch-model (~> 0.1.9)
@@ -1072,20 +1061,21 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.117.0)
+ gitaly-proto (~> 0.118.1)
github-linguist (~> 5.3.3)
+ github-markup (~> 1.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)
- gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-license (~> 1.0)
gitlab-markup (~> 1.6.4)
+ gitlab-sidekiq-fetcher
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (= 3.5.1)
gpgme
- grape (~> 1.0)
+ grape (~> 1.1)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)
@@ -1151,7 +1141,6 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
@@ -1203,9 +1192,8 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
- sidekiq (~> 5.1)
+ sidekiq (~> 5.2.1)
sidekiq-cron (~> 0.6.0)
- sidekiq-limit_fetch (~> 3.4)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index a067d1e4272..03efc4e9600 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -336,10 +336,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
+ sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
type = "gem";
};
- version = "1.3.1";
+ version = "1.3.2";
};
bootstrap_form = {
source = {
@@ -539,10 +539,10 @@
connection_pool = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
+ sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
type = "gem";
};
- version = "2.2.1";
+ version = "2.2.2";
};
crack = {
dependencies = ["safe_yaml"];
@@ -581,10 +581,10 @@
daemons = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+ sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
type = "gem";
};
- version = "1.2.3";
+ version = "1.2.6";
};
database_cleaner = {
source = {
@@ -730,15 +730,6 @@
};
version = "1.5.0";
};
- dropzonejs-rails = {
- dependencies = ["rails"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
- type = "gem";
- };
- version = "0.7.2";
- };
ed25519 = {
source = {
remotes = ["https://rubygems.org"];
@@ -852,10 +843,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
- version = "1.0.8";
+ version = "1.2.7";
};
excon = {
source = {
@@ -1166,10 +1157,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
+ sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
type = "gem";
};
- version = "0.117.0";
+ version = "0.118.1";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1206,15 +1197,6 @@
};
version = "4.2.7.5";
};
- gitlab-gollum-rugged_adapter = {
- dependencies = ["mime-types" "rugged"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
- type = "gem";
- };
- version = "0.4.4.1";
- };
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
@@ -1240,6 +1222,15 @@
};
version = "1.6.4";
};
+ gitlab-sidekiq-fetcher = {
+ dependencies = ["sidekiq"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
@@ -1333,10 +1324,10 @@
dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
+ sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
grape-entity = {
dependencies = ["activesupport" "multi_json"];
@@ -1892,10 +1883,10 @@
mini_mime = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
+ sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
mini_portile2 = {
source = {
@@ -1956,10 +1947,10 @@
mustermann = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
+ sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
mustermann-grape = {
dependencies = ["mustermann"];
@@ -2328,15 +2319,6 @@
};
version = "1.2.0";
};
- peek-sidekiq = {
- dependencies = ["atomic" "peek" "sidekiq"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x";
- type = "gem";
- };
- version = "1.0.3";
- };
pg = {
source = {
remotes = ["https://rubygems.org"];
@@ -2435,18 +2417,18 @@
dependencies = ["pry"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6";
+ sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
type = "gem";
};
- version = "0.3.5";
+ version = "0.3.6";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
pyu-ruby-sasl = {
source = {
@@ -2503,10 +2485,10 @@
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
+ sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp";
type = "gem";
};
- version = "2.0.1";
+ version = "2.0.3";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2820,10 +2802,10 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+ sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
type = "gem";
};
- version = "3.2.1";
+ version = "3.3.0";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -3193,13 +3175,13 @@
version = "3.1.2";
};
sidekiq = {
- dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack-protection" "redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
+ sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j";
type = "gem";
};
- version = "5.1.3";
+ version = "5.2.1";
};
sidekiq-cron = {
dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3210,15 +3192,6 @@
};
version = "0.6.0";
};
- sidekiq-limit_fetch = {
- dependencies = ["sidekiq"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
- type = "gem";
- };
- version = "3.4.0";
- };
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
@@ -3265,10 +3238,10 @@
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x";
+ sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
type = "gem";
};
- version = "2.0.1";
+ version = "2.0.2";
};
spring-commands-rspec = {
dependencies = ["spring"];
@@ -3409,10 +3382,10 @@
dependencies = ["daemons" "eventmachine" "rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
+ sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
type = "gem";
};
- version = "1.7.0";
+ version = "1.7.2";
};
thor = {
source = {
@@ -3639,10 +3612,10 @@
dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv";
+ sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
type = "gem";
};
- version = "0.9.10";
+ version = "0.9.11";
};
wikicloth = {
dependencies = ["builder" "expression_parser" "rinku"];
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 1a8fe6f5fe5..7419c52c48b 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,24 +1,35 @@
-{ stdenv, fetchurl, rustPlatform, darwin }:
+{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }:
with rustPlatform;
buildRustPackage rec {
name = "pijul-${version}";
- version = "0.8.0";
+ version = "0.10.0";
src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz";
- sha256 = "00pi03yp2bgnjpsz2hgaapxfw2i4idbjqc88cagpvn4yr1612wqx";
+ sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys";
};
- sourceRoot = "${name}/pijul";
+ cargoPatches = [
+ ./libpijul.patch
+ ];
- buildInputs = stdenv.lib.optionals stdenv.isDarwin
+ nativeBuildInputs = [ pkgconfig ];
+
+ postInstall = ''
+ mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
+ $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul
+ $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul
+ $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
+ '';
+
+ buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ Security ]);
doCheck = false;
- cargoSha256 = "1cnr08qbpia3336l37k1jli20d7kwnrw2gys8s9mg271cb4vdx03";
+ cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw";
meta = with stdenv.lib; {
description = "A distributed version control system";
diff --git a/pkgs/applications/version-management/pijul/libpijul.patch b/pkgs/applications/version-management/pijul/libpijul.patch
new file mode 100644
index 00000000000..9e4aa3cdd4b
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/libpijul.patch
@@ -0,0 +1,61 @@
+--- 2/pijul-0.10.0/Cargo.lock 1970-01-01 01:00:00.000000000 +0100
++++ pijul-0.10.0/Cargo.lock 2018-10-28 10:09:48.557639255 +0000
+@@ -552,7 +552,7 @@
+
+ [[package]]
+ name = "libpijul"
+-version = "0.10.0"
++version = "0.10.1"
+ dependencies = [
+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -577,9 +577,29 @@
+
+ [[package]]
+ name = "libpijul"
+-version = "0.10.0"
++version = "0.10.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-replace = "libpijul 0.10.0"
++dependencies = [
++ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
+
+ [[package]]
+ name = "line"
+@@ -917,7 +937,7 @@
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1796,7 +1816,7 @@
+ "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
+ "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
+ "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e"
+-"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe"
++"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd"
+ "checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42"
+ "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+ "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 106b66bcfec..d6ae37c3f7f 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "smartgithg-${version}";
- version = "18_1_4";
+ version = "18_1_5";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
- sha256 = "18gyfcs5g7xq8fqnn1zjzx350jaynrniain0giay8sxych12p4cm";
+ sha256 = "0f2aj3259jvn7n0x6m8sbwliikln9lqffd00jg75dblhxwl8adg3";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index c7a51508a8c..68ecabe3b9d 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
- version = "4.7.1";
+ version = "4.7.2";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d";
+ sha256 = "0y2q50380gnjzmyvmzh729ljgvq3wkcv6ham3w62mf4fjcvlpnag";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index c44bd25b91a..4dd2e019d1d 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -57,6 +57,8 @@ mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.erictapen ];
platforms = platforms.linux;
+ # binary segfaults at the moment
+ broken = true;
};
}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 7d9ce1ac453..3464b7aaeaa 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "27.0.0";
+ version = "28.2.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n";
+ sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 58ed3ec59b2..52876bb1bbc 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmake, qtscript }:
stdenv.mkDerivation rec {
- name = "smplayer-18.9.0";
+ name = "smplayer-18.10.0";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "0gff22yh2h76cyqsbjpa7rax51sfzygjl3isd8dk47zar9cyvw8d";
+ sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b08ff812ace..6cba5236a5f 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -12,6 +12,7 @@
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
, jackSupport ? false
, fetchpatch
+, removeReferencesTo
}:
with stdenv.lib;
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optional jackSupport libjack2;
- nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
enableParallelBuilding = true;
@@ -60,10 +61,14 @@ stdenv.mkDerivation rec {
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
'';
- # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+ # - Touch plugins (plugins cache keyed off mtime and file size:
+ # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+ # - Remove references to the Qt development headers (used in error messages)
postFixup = ''
find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
$out/lib/vlc/vlc-cache-gen $out/vlc/plugins
+
+ remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
'';
# Most of the libraries are auto-detected so we don't need to set a bunch of
@@ -72,6 +77,11 @@ stdenv.mkDerivation rec {
"--with-kde-solid=$out/share/apps/solid/actions"
] ++ optional onlyLibVLC "--disable-vlc";
+ # Remove runtime dependencies on libraries
+ postConfigure = ''
+ sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE ""|g' config.h
+ '';
+
meta = with stdenv.lib; {
description = "Cross-platform media player and streaming server";
homepage = http://www.videolan.org/vlc/;
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
new file mode 100644
index 00000000000..79dbddfab55
--- /dev/null
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ name = "cntr-${version}";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "Mic92";
+ repo = "cntr";
+ rev = version;
+ sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
+ };
+
+ cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51";
+
+ meta = with stdenv.lib; {
+ description = "A container debugging tool based on FUSE";
+ homepage = https://github.com/Mic92/cntr;
+ license = licenses.mit;
+ # aarch64 support will be fixed soon
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.mic92 ];
+ };
+}
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index a1ff9bde3ed..bd44b4fcbfe 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "containerd-${version}";
- version = "1.1.4";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah";
+ sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
new file mode 100644
index 00000000000..3b764e7095b
--- /dev/null
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
+
+stdenv.mkDerivation rec {
+ name = "jwm-settings-manager-${version}";
+ version = "2018-10-19";
+
+ src = fetchFromGitHub {
+ owner = "Israel-D";
+ repo = "jwm-settings-manager";
+ rev = "cb32a70563cf1f3927339093481542b85ec3c8c8";
+ sha256 = "0d5bqf74p8zg8azns44g46q973blhmp715k8kcd73x88g7sfir8s";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ gettext
+ ];
+
+ buildInputs = [
+ libXpm
+ libGL
+ fltk
+ hicolor-icon-theme
+ which # needed at runtime to locate optional programs
+ glib.bin # provides gsettings
+ gnome2.GConf # provides gconftool-2
+ ];
+
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out"
+ substituteInPlace data/CMakeLists.txt \
+ --replace 'DESTINATION usr/share' "DESTINATION share"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A full configuration manager for JWM";
+ homepage = https://joewing.net/projects/jwm;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
new file mode 100644
index 00000000000..5aebb7ed8dd
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/beta.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja
+, pkgconfig, scdoc
+, wayland, libxkbcommon, pcre, json_c, dbus
+, pango, cairo, libinput, libcap, pam, gdk_pixbuf
+, wlroots, wayland-protocols
+, buildDocs ? true
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "sway";
+ version = "1.0-beta.1";
+
+ src = fetchFromGitHub {
+ owner = "swaywm";
+ repo = "sway";
+ rev = version;
+ sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig meson ninja
+ ] ++ stdenv.lib.optional buildDocs scdoc;
+
+ buildInputs = [
+ wayland libxkbcommon pcre json_c dbus
+ pango cairo libinput libcap pam gdk_pixbuf
+ wlroots wayland-protocols
+ ];
+
+ enableParallelBuilding = true;
+
+ mesonFlags = "-Dsway-version=${version}";
+
+ meta = with stdenv.lib; {
+ description = "i3-compatible window manager for Wayland";
+ homepage = https://swaywm.org;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
+ };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 50614534f8e..fb30f0073bf 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";
- homepage = http://swaywm.org;
+ homepage = https://swaywm.org;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index f9ca245beea..3ac1e52f309 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -186,6 +186,7 @@ stdenv.mkDerivation {
}.${targetPlatform.parsed.cpu.name}
else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
else if targetPlatform.isSparc then "sparc"
+ else if targetPlatform.isAvr then "avr"
else throw "unknown emulation for platform: " + targetPlatform.config;
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
@@ -209,7 +210,7 @@ stdenv.mkDerivation {
## General libc support
##
- echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
+ echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
@@ -292,6 +293,16 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" pic"
''
+ + optionalString targetPlatform.isAvr ''
+ hardening_unsupported_flags+=" relro bindnow"
+ ''
+
+ + optionalString (libc != null && targetPlatform.isAvr) ''
+ for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
+ echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
+ done
+ ''
+
+ ''
set +u
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
index 375c30e1e46..70a7a43bd39 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
@@ -1,18 +1,15 @@
-{ stdenv, pkgconfig, glib }:
+{ stdenv, meson, ninja, pkgconfig, glib }:
stdenv.mkDerivation {
name = "chrootenv";
+ src = ./.;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ glib ];
- buildCommand = ''
- cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out
- '';
-
meta = with stdenv.lib; {
description = "Setup mount/user namespace for FHS emulation";
- license = licenses.free;
+ license = licenses.mit;
maintainers = with maintainers; [ yegortimoshenko ];
platforms = platforms.linux;
};
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
new file mode 100644
index 00000000000..6d0770a0dc4
--- /dev/null
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
@@ -0,0 +1,5 @@
+project('chrootenv', 'c')
+
+glib = dependency('glib-2.0')
+
+executable('chrootenv', 'chrootenv.c', dependencies: [glib], install: true)
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index c733556de45..707b256cd4b 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -28,7 +28,7 @@ in runCommand name {
passthru = passthru // {
env = runCommand "${name}-shell-env" {
shellHook = ''
- exec ${chrootenv} ${init "bash"} "$(pwd)"
+ exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)"
'';
} ''
echo >&2 ""
@@ -41,7 +41,7 @@ in runCommand name {
mkdir -p $out/bin
cat <$out/bin/${name}
#! ${stdenv.shell}
- exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@"
+ exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@"
EOF
chmod +x $out/bin/${name}
${extraInstallCommands}
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e59758371a3..06aa9436bfc 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -232,7 +232,7 @@ stdenv.mkDerivation {
# compile, because it uses "#include_next " to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
- echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
+ echo "-B${libc_lib}${libc.libdir or "/lib/"} -idirafter ${libc_dev}${libc.incdir or "/include"} ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
@@ -284,6 +284,20 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector"
''
+ + optionalString targetPlatform.isAvr ''
+ hardening_unsupported_flags+=" stackprotector pic"
+ ''
+
+ + optionalString (targetPlatform.libc == "newlib") ''
+ hardening_unsupported_flags+=" stackprotector fortify pie pic"
+ ''
+
+ + optionalString (libc != null && targetPlatform.isAvr) ''
+ for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
+ echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
+ done
+ ''
+
+ ''
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index f65118ba4a6..252a0ff521f 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -2,7 +2,7 @@
{ crateName,
dependencies,
crateFeatures, libName, release, libPath,
- crateType, metadata, crateBin,
+ crateType, metadata, crateBin, hasCrateBin,
extraRustcOpts, verbose, colors }:
let
@@ -13,6 +13,17 @@
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=1"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
+
+ # Some platforms have different names for rustc.
+ rustPlatform =
+ with stdenv.hostPlatform.parsed;
+ let cpu_ = if cpu.name == "armv7a" then "armv7"
+ else cpu.name;
+ vendor_ = vendor.name;
+ kernel_ = kernel.name;
+ abi_ = abi.name;
+ in
+ "${cpu_}-${vendor_}-${kernel_}-${abi_}";
in ''
runHook preBuild
norm=""
@@ -32,7 +43,8 @@
lib_src=$1
echo_build_heading $lib_src ${libName}
- noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
+ noisily rustc --crate-name $CRATE_NAME $lib_src \
+ ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)} \
${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
--emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
@@ -54,7 +66,8 @@
noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
$LINK ${deps}$EXTRA_LIB --cap-lints allow \
- $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \
+ ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""}
if [ "$crate_name_" != "$crate_name" ]; then
mv target/bin/$crate_name_ target/bin/$crate_name
fi
@@ -103,9 +116,9 @@
tr '\n' ' ' < target/link > target/link_
LINK=$(cat target/link_)
fi
-
- mkdir -p target/bin
+ ${lib.optionalString (crateBin != "") ''
printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
+ mkdir -p target/bin
# filter empty entries / empty "lines"
if [[ -z "$BIN_NAME" ]]; then
continue
@@ -141,13 +154,15 @@
fi
build_bin "$BIN_NAME" "$BIN_PATH"
done
+ ''}
-
- ${lib.optionalString (crateBin == "") ''
+ ${lib.optionalString (crateBin == "" && !hasCrateBin) ''
if [[ -e src/main.rs ]]; then
+ mkdir -p target/bin
build_bin ${crateName} src/main.rs
fi
for i in src/bin/*.rs; do #*/
+ mkdir -p target/bin
build_bin "$(basename $i .rs)" "$i"
done
''}
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index a11cef9f1f4..ec11472bbae 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -4,7 +4,7 @@
# This can be useful for deploying packages with NixOps, and to share
# binary dependencies between projects.
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }:
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }:
let
# This doesn't appear to be officially documented anywhere yet.
@@ -16,7 +16,7 @@ let
makeDeps = dependencies:
(lib.concatMapStringsSep " " (dep:
let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
- (if dep.crateType == "lib" then
+ (if lib.lists.any (x: x == "lib") dep.crateType then
" --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
else
" --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
@@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
else
fetchCrate { inherit (crate) crateName version sha256; };
name = "rust_${crate.crateName}-${crate.version}";
- buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
+ depsBuildBuild = [ rust stdenv.cc ];
+ buildInputs = (crate.buildInputs or []) ++ buildInputs_;
dependencies =
builtins.map
(dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
@@ -122,15 +123,16 @@ stdenv.mkDerivation (rec {
) "" crate.crateBin
else "";
+ hasCrateBin = crate ? crateBin;
build = crate.build or "";
workspace_member = crate.workspace_member or ".";
crateVersion = crate.version;
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
crateType =
- if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
- if lib.attrByPath ["plugin"] false crate then "dylib" else
- (crate.type or "lib");
+ if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else
+ if lib.attrByPath ["plugin"] false crate then ["dylib"] else
+ (crate.type or ["lib"]);
colors = lib.attrByPath [ "colors" ] "always" crate;
extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
configurePhase = configureCrate {
@@ -143,7 +145,7 @@ stdenv.mkDerivation (rec {
buildPhase = buildCrate {
inherit crateName dependencies
crateFeatures libName release libPath crateType
- metadata crateBin verbose colors
+ metadata crateBin hasCrateBin verbose colors
extraRustcOpts;
};
installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix
new file mode 100644
index 00000000000..e04324684e5
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix
@@ -0,0 +1,24 @@
+{stdenv, lib}:
+{
+ kernel = stdenv.hostPlatform.parsed.kernel.name;
+ abi = stdenv.hostPlatform.parsed.abi.name;
+ updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+ mapFeatures = features: map (fun: fun { features = features; });
+ mkFeatures = feat: lib.lists.foldl (features: featureName:
+ if feat.${featureName} or false then
+ [ featureName ] ++ features
+ else
+ features
+ ) [] (builtins.attrNames feat);
+ include = includedFiles: src: builtins.filterSource (path: type:
+ lib.lists.any (f:
+ let p = toString (src + ("/" + f)); in
+ (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+ ) includedFiles
+ ) src;
+ exclude = excludedFiles: src: builtins.filterSource (path: type:
+ lib.lists.all (f:
+ !lib.strings.hasPrefix (toString (src + ("/" + f))) path
+ ) excludedFiles
+ ) src;
+}
diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 0b8b3d60b6c..7a0d92f81b4 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -1,1444 +1,251 @@
-# Generated by carnix 0.7.2: carnix nix
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.hostPlatform.parsed.kernel.name;
- abi = stdenv.hostPlatform.parsed.abi.name;
- updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
- mapFeatures = features: map (fun: fun { features = features; });
- mkFeatures = feat: lib.lists.foldl (features: featureName:
- if feat.${featureName} or false then
- [ featureName ] ++ features
- else
- features
- ) [] (builtins.attrNames feat);
+# Generated by carnix 0.8.11: carnix generate-nix
+{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
+with buildRustCrateHelpers;
+let inherit (lib.lists) fold;
+ inherit (lib.attrsets) recursiveUpdate;
in
+let crates = cratesIO; in
rec {
- carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; };
+ carnix = crates.crates.carnix."0.8.11" deps;
__all = [ (carnix {}) ];
- aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "aho-corasick";
- version = "0.6.4";
- authors = [ "Andrew Gallant " ];
- sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888";
- libName = "aho_corasick";
- crateBin = [ { name = "aho-corasick-dot"; } ];
- inherit dependencies buildDependencies features;
+ deps.aho_corasick."0.6.8" = {
+ memchr = "2.1.0";
+ };
+ deps.ansi_term."0.11.0" = {
+ winapi = "0.3.6";
+ };
+ deps.argon2rs."0.2.5" = {
+ blake2_rfc = "0.2.18";
+ scoped_threadpool = "0.1.9";
+ };
+ deps.arrayvec."0.4.7" = {
+ nodrop = "0.1.12";
+ };
+ deps.atty."0.2.11" = {
+ termion = "1.5.1";
+ libc = "0.2.43";
+ winapi = "0.3.6";
+ };
+ deps.backtrace."0.3.9" = {
+ cfg_if = "0.1.6";
+ rustc_demangle = "0.1.9";
+ backtrace_sys = "0.1.24";
+ libc = "0.2.43";
+ winapi = "0.3.6";
+ };
+ deps.backtrace_sys."0.1.24" = {
+ libc = "0.2.43";
+ cc = "1.0.25";
+ };
+ deps.bitflags."1.0.4" = {};
+ deps.blake2_rfc."0.2.18" = {
+ arrayvec = "0.4.7";
+ constant_time_eq = "0.1.3";
+ };
+ deps.carnix."0.8.11" = {
+ clap = "2.32.0";
+ dirs = "1.0.4";
+ env_logger = "0.5.13";
+ error_chain = "0.12.0";
+ itertools = "0.7.8";
+ log = "0.4.5";
+ nom = "3.2.1";
+ regex = "1.0.5";
+ rusqlite = "0.14.0";
+ serde = "1.0.80";
+ serde_derive = "1.0.80";
+ serde_json = "1.0.32";
+ tempdir = "0.3.7";
+ toml = "0.4.8";
+ };
+ deps.cc."1.0.25" = {};
+ deps.cfg_if."0.1.6" = {};
+ deps.clap."2.32.0" = {
+ atty = "0.2.11";
+ bitflags = "1.0.4";
+ strsim = "0.7.0";
+ textwrap = "0.10.0";
+ unicode_width = "0.1.5";
+ vec_map = "0.8.1";
+ ansi_term = "0.11.0";
+ };
+ deps.constant_time_eq."0.1.3" = {};
+ deps.dirs."1.0.4" = {
+ redox_users = "0.2.0";
+ libc = "0.2.43";
+ winapi = "0.3.6";
+ };
+ deps.either."1.5.0" = {};
+ deps.env_logger."0.5.13" = {
+ atty = "0.2.11";
+ humantime = "1.1.1";
+ log = "0.4.5";
+ regex = "1.0.5";
+ termcolor = "1.0.4";
+ };
+ deps.error_chain."0.12.0" = {
+ backtrace = "0.3.9";
+ };
+ deps.failure."0.1.3" = {
+ backtrace = "0.3.9";
+ failure_derive = "0.1.3";
+ };
+ deps.failure_derive."0.1.3" = {
+ proc_macro2 = "0.4.20";
+ quote = "0.6.8";
+ syn = "0.15.13";
+ synstructure = "0.10.0";
+ };
+ deps.fuchsia_zircon."0.3.3" = {
+ bitflags = "1.0.4";
+ fuchsia_zircon_sys = "0.3.3";
+ };
+ deps.fuchsia_zircon_sys."0.3.3" = {};
+ deps.humantime."1.1.1" = {
+ quick_error = "1.2.2";
+ };
+ deps.itertools."0.7.8" = {
+ either = "1.5.0";
+ };
+ deps.itoa."0.4.3" = {};
+ deps.lazy_static."1.1.0" = {
+ version_check = "0.1.5";
+ };
+ deps.libc."0.2.43" = {};
+ deps.libsqlite3_sys."0.9.3" = {
+ pkg_config = "0.3.14";
+ };
+ deps.linked_hash_map."0.4.2" = {};
+ deps.log."0.4.5" = {
+ cfg_if = "0.1.6";
+ };
+ deps.lru_cache."0.1.1" = {
+ linked_hash_map = "0.4.2";
+ };
+ deps.memchr."1.0.2" = {
+ libc = "0.2.43";
+ };
+ deps.memchr."2.1.0" = {
+ cfg_if = "0.1.6";
+ libc = "0.2.43";
+ version_check = "0.1.5";
+ };
+ deps.nodrop."0.1.12" = {};
+ deps.nom."3.2.1" = {
+ memchr = "1.0.2";
+ };
+ deps.pkg_config."0.3.14" = {};
+ deps.proc_macro2."0.4.20" = {
+ unicode_xid = "0.1.0";
+ };
+ deps.quick_error."1.2.2" = {};
+ deps.quote."0.6.8" = {
+ proc_macro2 = "0.4.20";
+ };
+ deps.rand."0.4.3" = {
+ fuchsia_zircon = "0.3.3";
+ libc = "0.2.43";
+ winapi = "0.3.6";
+ };
+ deps.redox_syscall."0.1.40" = {};
+ deps.redox_termios."0.1.1" = {
+ redox_syscall = "0.1.40";
+ };
+ deps.redox_users."0.2.0" = {
+ argon2rs = "0.2.5";
+ failure = "0.1.3";
+ rand = "0.4.3";
+ redox_syscall = "0.1.40";
+ };
+ deps.regex."1.0.5" = {
+ aho_corasick = "0.6.8";
+ memchr = "2.1.0";
+ regex_syntax = "0.6.2";
+ thread_local = "0.3.6";
+ utf8_ranges = "1.0.1";
+ };
+ deps.regex_syntax."0.6.2" = {
+ ucd_util = "0.1.1";
+ };
+ deps.remove_dir_all."0.5.1" = {
+ winapi = "0.3.6";
+ };
+ deps.rusqlite."0.14.0" = {
+ bitflags = "1.0.4";
+ libsqlite3_sys = "0.9.3";
+ lru_cache = "0.1.1";
+ time = "0.1.40";
+ };
+ deps.rustc_demangle."0.1.9" = {};
+ deps.ryu."0.2.6" = {};
+ deps.scoped_threadpool."0.1.9" = {};
+ deps.serde."1.0.80" = {};
+ deps.serde_derive."1.0.80" = {
+ proc_macro2 = "0.4.20";
+ quote = "0.6.8";
+ syn = "0.15.13";
+ };
+ deps.serde_json."1.0.32" = {
+ itoa = "0.4.3";
+ ryu = "0.2.6";
+ serde = "1.0.80";
+ };
+ deps.strsim."0.7.0" = {};
+ deps.syn."0.15.13" = {
+ proc_macro2 = "0.4.20";
+ quote = "0.6.8";
+ unicode_xid = "0.1.0";
+ };
+ deps.synstructure."0.10.0" = {
+ proc_macro2 = "0.4.20";
+ quote = "0.6.8";
+ syn = "0.15.13";
+ unicode_xid = "0.1.0";
+ };
+ deps.tempdir."0.3.7" = {
+ rand = "0.4.3";
+ remove_dir_all = "0.5.1";
+ };
+ deps.termcolor."1.0.4" = {
+ wincolor = "1.0.1";
+ };
+ deps.termion."1.5.1" = {
+ libc = "0.2.43";
+ redox_syscall = "0.1.40";
+ redox_termios = "0.1.1";
+ };
+ deps.textwrap."0.10.0" = {
+ unicode_width = "0.1.5";
+ };
+ deps.thread_local."0.3.6" = {
+ lazy_static = "1.1.0";
+ };
+ deps.time."0.1.40" = {
+ libc = "0.2.43";
+ redox_syscall = "0.1.40";
+ winapi = "0.3.6";
+ };
+ deps.toml."0.4.8" = {
+ serde = "1.0.80";
+ };
+ deps.ucd_util."0.1.1" = {};
+ deps.unicode_width."0.1.5" = {};
+ deps.unicode_xid."0.1.0" = {};
+ deps.utf8_ranges."1.0.1" = {};
+ deps.vcpkg."0.2.6" = {};
+ deps.vec_map."0.8.1" = {};
+ deps.version_check."0.1.5" = {};
+ deps.winapi."0.3.6" = {
+ winapi_i686_pc_windows_gnu = "0.4.0";
+ winapi_x86_64_pc_windows_gnu = "0.4.0";
+ };
+ deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
+ deps.winapi_util."0.1.1" = {
+ winapi = "0.3.6";
+ };
+ deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
+ deps.wincolor."1.0.1" = {
+ winapi = "0.3.6";
+ winapi_util = "0.1.1";
};
- ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "ansi_term";
- version = "0.11.0";
- authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ];
- sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
- inherit dependencies buildDependencies features;
- };
- atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "atty";
- version = "0.2.8";
- authors = [ "softprops " ];
- sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d";
- inherit dependencies buildDependencies features;
- };
- backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "backtrace";
- version = "0.3.6";
- authors = [ "Alex Crichton " "The Rust Project Developers" ];
- sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx";
- inherit dependencies buildDependencies features;
- };
- backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "backtrace-sys";
- version = "0.1.16";
- authors = [ "Alex Crichton " ];
- sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "bitflags";
- version = "1.0.1";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1";
- inherit dependencies buildDependencies features;
- };
- carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "carnix";
- version = "0.7.2";
- authors = [ "pe@pijul.org " ];
- sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5";
- crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ];
- inherit dependencies buildDependencies features;
- };
- cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cc";
- version = "1.0.10";
- authors = [ "Alex Crichton " ];
- sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn";
- inherit dependencies buildDependencies features;
- };
- cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "cfg-if";
- version = "0.1.2";
- authors = [ "Alex Crichton " ];
- sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
- inherit dependencies buildDependencies features;
- };
- clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "clap";
- version = "2.31.2";
- authors = [ "Kevin K. " ];
- sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72";
- inherit dependencies buildDependencies features;
- };
- dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "dtoa";
- version = "0.4.2";
- authors = [ "David Tolnay " ];
- sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
- inherit dependencies buildDependencies features;
- };
- either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "either";
- version = "1.5.0";
- authors = [ "bluss" ];
- sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
- inherit dependencies buildDependencies features;
- };
- env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "env_logger";
- version = "0.5.7";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l";
- inherit dependencies buildDependencies features;
- };
- error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "error-chain";
- version = "0.11.0";
- authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ];
- sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
- inherit dependencies buildDependencies features;
- };
- fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fuchsia-zircon";
- version = "0.3.3";
- authors = [ "Raph Levien " ];
- sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
- inherit dependencies buildDependencies features;
- };
- fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "fuchsia-zircon-sys";
- version = "0.3.3";
- authors = [ "Raph Levien " ];
- sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
- inherit dependencies buildDependencies features;
- };
- humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "humantime";
- version = "1.1.1";
- authors = [ "Paul Colomiets " ];
- sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn";
- libPath = "src/lib.rs";
- inherit dependencies buildDependencies features;
- };
- itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "itertools";
- version = "0.7.8";
- authors = [ "bluss" ];
- sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357";
- inherit dependencies buildDependencies features;
- };
- itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "itoa";
- version = "0.4.1";
- authors = [ "David Tolnay " ];
- sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij";
- inherit dependencies buildDependencies features;
- };
- lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "lazy_static";
- version = "1.0.0";
- authors = [ "Marvin Löbel " ];
- sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh";
- inherit dependencies buildDependencies features;
- };
- libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libc";
- version = "0.2.40";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83";
- inherit dependencies buildDependencies features;
- };
- libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "libsqlite3-sys";
- version = "0.9.1";
- authors = [ "John Gallagher " ];
- sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "linked-hash-map";
- version = "0.4.2";
- authors = [ "Stepan Koltsov " "Andrew Paseltiner " ];
- sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
- inherit dependencies buildDependencies features;
- };
- log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "log";
- version = "0.4.1";
- authors = [ "The Rust Project Developers" ];
- sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d";
- inherit dependencies buildDependencies features;
- };
- lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "lru-cache";
- version = "0.1.1";
- authors = [ "Stepan Koltsov " ];
- sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
- inherit dependencies buildDependencies features;
- };
- memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "memchr";
- version = "1.0.2";
- authors = [ "Andrew Gallant " "bluss" ];
- sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
- inherit dependencies buildDependencies features;
- };
- memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "memchr";
- version = "2.0.1";
- authors = [ "Andrew Gallant " "bluss" ];
- sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
- inherit dependencies buildDependencies features;
- };
- nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "nom";
- version = "3.2.1";
- authors = [ "contact@geoffroycouprie.com" ];
- sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07";
- inherit dependencies buildDependencies features;
- };
- num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "num-traits";
- version = "0.2.2";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0";
- 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;
- };
- proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "proc-macro2";
- version = "0.3.6";
- authors = [ "Alex Crichton " ];
- sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp";
- inherit dependencies buildDependencies features;
- };
- quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "quick-error";
- version = "1.2.1";
- authors = [ "Paul Colomiets " "Colin Kiegel " ];
- sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6";
- inherit dependencies buildDependencies features;
- };
- quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "quote";
- version = "0.5.1";
- authors = [ "David Tolnay " ];
- sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r";
- inherit dependencies buildDependencies features;
- };
- rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "rand";
- version = "0.4.2";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
- inherit dependencies buildDependencies features;
- };
- redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "redox_syscall";
- version = "0.1.37";
- authors = [ "Jeremy Soller " ];
- sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v";
- libName = "syscall";
- inherit dependencies buildDependencies features;
- };
- redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "redox_termios";
- version = "0.1.1";
- authors = [ "Jeremy Soller " ];
- sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
- libPath = "src/lib.rs";
- inherit dependencies buildDependencies features;
- };
- regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "regex";
- version = "0.2.10";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca";
- inherit dependencies buildDependencies features;
- };
- regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "regex-syntax";
- version = "0.5.5";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp";
- inherit dependencies buildDependencies features;
- };
- remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "remove_dir_all";
- version = "0.5.0";
- authors = [ "Aaronepower " ];
- sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y";
- inherit dependencies buildDependencies features;
- };
- rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "rusqlite";
- version = "0.13.0";
- authors = [ "John Gallagher " ];
- sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc";
- inherit dependencies buildDependencies features;
- };
- rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "rustc-demangle";
- version = "0.1.7";
- authors = [ "Alex Crichton " ];
- sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6";
- inherit dependencies buildDependencies features;
- };
- serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "serde";
- version = "1.0.38";
- authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk";
- inherit dependencies buildDependencies features;
- };
- serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "serde_derive";
- version = "1.0.38";
- authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m";
- procMacro = true;
- inherit dependencies buildDependencies features;
- };
- serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "serde_derive_internals";
- version = "0.23.1";
- authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4";
- inherit dependencies buildDependencies features;
- };
- serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "serde_json";
- version = "1.0.14";
- authors = [ "Erick Tryzelaar " "David Tolnay " ];
- sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj";
- inherit dependencies buildDependencies features;
- };
- strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "strsim";
- version = "0.7.0";
- authors = [ "Danny Guo " ];
- sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
- inherit dependencies buildDependencies features;
- };
- syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "syn";
- version = "0.13.1";
- authors = [ "David Tolnay " ];
- sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg";
- inherit dependencies buildDependencies features;
- };
- tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "tempdir";
- version = "0.3.7";
- authors = [ "The Rust Project Developers" ];
- sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
- inherit dependencies buildDependencies features;
- };
- termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "termcolor";
- version = "0.3.6";
- authors = [ "Andrew Gallant " ];
- sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z";
- inherit dependencies buildDependencies features;
- };
- termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "termion";
- version = "1.5.1";
- authors = [ "ticki " "gycos " "IGI-111 " ];
- sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
- inherit dependencies buildDependencies features;
- };
- textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "textwrap";
- version = "0.9.0";
- authors = [ "Martin Geisler " ];
- sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb";
- inherit dependencies buildDependencies features;
- };
- thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "thread_local";
- version = "0.3.5";
- authors = [ "Amanieu d'Antras " ];
- sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6";
- inherit dependencies buildDependencies features;
- };
- time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "time";
- version = "0.1.39";
- authors = [ "The Rust Project Developers" ];
- sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if";
- inherit dependencies buildDependencies features;
- };
- toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "toml";
- version = "0.4.6";
- authors = [ "Alex Crichton " ];
- sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v";
- inherit dependencies buildDependencies features;
- };
- ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "ucd-util";
- version = "0.1.1";
- authors = [ "Andrew Gallant " ];
- sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
- 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;
- };
- unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "unicode-xid";
- version = "0.1.0";
- authors = [ "erick.tryzelaar " "kwantam " ];
- sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
- inherit dependencies buildDependencies features;
- };
- unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "unreachable";
- version = "1.0.0";
- authors = [ "Jonathan Reem " ];
- sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
- inherit dependencies buildDependencies features;
- };
- utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "utf8-ranges";
- version = "1.0.0";
- authors = [ "Andrew Gallant " ];
- sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
- inherit dependencies buildDependencies features;
- };
- vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "vcpkg";
- version = "0.2.3";
- authors = [ "Jim McGrath " ];
- sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c";
- inherit dependencies buildDependencies features;
- };
- vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "vec_map";
- version = "0.8.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 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay";
- 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;
- };
- winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "winapi";
- version = "0.3.4";
- authors = [ "Peter Atashian " ];
- sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "winapi-i686-pc-windows-gnu";
- version = "0.4.0";
- authors = [ "Peter Atashian " ];
- sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "winapi-x86_64-pc-windows-gnu";
- version = "0.4.0";
- authors = [ "Peter Atashian " ];
- sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
- build = "build.rs";
- inherit dependencies buildDependencies features;
- };
- wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
- crateName = "wincolor";
- version = "0.1.6";
- authors = [ "Andrew Gallant " ];
- sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47";
- inherit dependencies buildDependencies features;
- };
- aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
- dependencies = mapFeatures features ([ memchr_2_0_1 ]);
- };
- aho_corasick_0_6_4_features = f: updateFeatures f (rec {
- aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
- memchr_2_0_1.default = true;
- }) [ memchr_2_0_1_features ];
- ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
- dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
- };
- ansi_term_0_11_0_features = f: updateFeatures f (rec {
- ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
- winapi_0_3_4.consoleapi = true;
- winapi_0_3_4.default = true;
- winapi_0_3_4.errhandlingapi = true;
- winapi_0_3_4.processenv = true;
- }) [ winapi_0_3_4_features ];
- atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ {
- dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
- ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
- };
- atty_0_2_8_features = f: updateFeatures f (rec {
- atty_0_2_8.default = (f.atty_0_2_8.default or true);
- libc_0_2_40.default = (f.libc_0_2_40.default or false);
- termion_1_5_1.default = true;
- winapi_0_3_4.consoleapi = true;
- winapi_0_3_4.default = true;
- winapi_0_3_4.minwinbase = true;
- winapi_0_3_4.minwindef = true;
- winapi_0_3_4.processenv = true;
- winapi_0_3_4.winbase = true;
- }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ];
- backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ {
- dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ])
- ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
- ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else [])
- ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ ]
- ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []);
- features = mkFeatures (features.backtrace_0_3_6 or {});
- };
- backtrace_0_3_6_features = f: updateFeatures f (rec {
- backtrace_0_3_6.addr2line =
- (f.backtrace_0_3_6.addr2line or false) ||
- (f.backtrace_0_3_6.gimli-symbolize or false) ||
- (backtrace_0_3_6.gimli-symbolize or false);
- backtrace_0_3_6.backtrace-sys =
- (f.backtrace_0_3_6.backtrace-sys or false) ||
- (f.backtrace_0_3_6.libbacktrace or false) ||
- (backtrace_0_3_6.libbacktrace or false);
- backtrace_0_3_6.coresymbolication =
- (f.backtrace_0_3_6.coresymbolication or false) ||
- (f.backtrace_0_3_6.default or false) ||
- (backtrace_0_3_6.default or false);
- backtrace_0_3_6.dbghelp =
- (f.backtrace_0_3_6.dbghelp or false) ||
- (f.backtrace_0_3_6.default or false) ||
- (backtrace_0_3_6.default or false);
- backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true);
- backtrace_0_3_6.dladdr =
- (f.backtrace_0_3_6.dladdr or false) ||
- (f.backtrace_0_3_6.default or false) ||
- (backtrace_0_3_6.default or false);
- backtrace_0_3_6.findshlibs =
- (f.backtrace_0_3_6.findshlibs or false) ||
- (f.backtrace_0_3_6.gimli-symbolize or false) ||
- (backtrace_0_3_6.gimli-symbolize or false);
- backtrace_0_3_6.gimli =
- (f.backtrace_0_3_6.gimli or false) ||
- (f.backtrace_0_3_6.gimli-symbolize or false) ||
- (backtrace_0_3_6.gimli-symbolize or false);
- backtrace_0_3_6.libbacktrace =
- (f.backtrace_0_3_6.libbacktrace or false) ||
- (f.backtrace_0_3_6.default or false) ||
- (backtrace_0_3_6.default or false);
- backtrace_0_3_6.libunwind =
- (f.backtrace_0_3_6.libunwind or false) ||
- (f.backtrace_0_3_6.default or false) ||
- (backtrace_0_3_6.default or false);
- backtrace_0_3_6.memmap =
- (f.backtrace_0_3_6.memmap or false) ||
- (f.backtrace_0_3_6.gimli-symbolize or false) ||
- (backtrace_0_3_6.gimli-symbolize or false);
- backtrace_0_3_6.object =
- (f.backtrace_0_3_6.object or false) ||
- (f.backtrace_0_3_6.gimli-symbolize or false) ||
- (backtrace_0_3_6.gimli-symbolize or false);
- backtrace_0_3_6.rustc-serialize =
- (f.backtrace_0_3_6.rustc-serialize or false) ||
- (f.backtrace_0_3_6.serialize-rustc or false) ||
- (backtrace_0_3_6.serialize-rustc or false);
- backtrace_0_3_6.serde =
- (f.backtrace_0_3_6.serde or false) ||
- (f.backtrace_0_3_6.serialize-serde or false) ||
- (backtrace_0_3_6.serialize-serde or false);
- backtrace_0_3_6.serde_derive =
- (f.backtrace_0_3_6.serde_derive or false) ||
- (f.backtrace_0_3_6.serialize-serde or false) ||
- (backtrace_0_3_6.serialize-serde or false);
- backtrace_0_3_6.winapi =
- (f.backtrace_0_3_6.winapi or false) ||
- (f.backtrace_0_3_6.dbghelp or false) ||
- (backtrace_0_3_6.dbghelp or false);
- backtrace_sys_0_1_16.default = true;
- cfg_if_0_1_2.default = true;
- libc_0_2_40.default = true;
- rustc_demangle_0_1_7.default = true;
- winapi_0_3_4.dbghelp = true;
- winapi_0_3_4.default = true;
- winapi_0_3_4.minwindef = true;
- winapi_0_3_4.processthreadsapi = true;
- winapi_0_3_4.std = true;
- winapi_0_3_4.winnt = true;
- }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ];
- backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ {
- dependencies = mapFeatures features ([ libc_0_2_40 ]);
- buildDependencies = mapFeatures features ([ cc_1_0_10 ]);
- };
- backtrace_sys_0_1_16_features = f: updateFeatures f (rec {
- backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true);
- cc_1_0_10.default = true;
- libc_0_2_40.default = true;
- }) [ libc_0_2_40_features cc_1_0_10_features ];
- bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ {
- features = mkFeatures (features.bitflags_1_0_1 or {});
- };
- bitflags_1_0_1_features = f: updateFeatures f (rec {
- bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true);
- bitflags_1_0_1.example_generated =
- (f.bitflags_1_0_1.example_generated or false) ||
- (f.bitflags_1_0_1.default or false) ||
- (bitflags_1_0_1.default or false);
- }) [];
- carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ {
- dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]);
- };
- carnix_0_7_2_features = f: updateFeatures f (rec {
- carnix_0_7_2.default = (f.carnix_0_7_2.default or true);
- clap_2_31_2.default = true;
- env_logger_0_5_7.default = true;
- error_chain_0_11_0.default = true;
- itertools_0_7_8.default = true;
- log_0_4_1.default = true;
- nom_3_2_1.default = true;
- regex_0_2_10.default = true;
- rusqlite_0_13_0.default = true;
- serde_1_0_38.default = true;
- serde_derive_1_0_38.default = true;
- serde_json_1_0_14.default = true;
- tempdir_0_3_7.default = true;
- toml_0_4_6.default = true;
- }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ];
- cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.cc_1_0_10 or {});
- };
- cc_1_0_10_features = f: updateFeatures f (rec {
- cc_1_0_10.default = (f.cc_1_0_10.default or true);
- cc_1_0_10.rayon =
- (f.cc_1_0_10.rayon or false) ||
- (f.cc_1_0_10.parallel or false) ||
- (cc_1_0_10.parallel or false);
- }) [];
- cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {};
- cfg_if_0_1_2_features = f: updateFeatures f (rec {
- cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true);
- }) [];
- clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ {
- dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ]
- ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else [])
- ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else [])
- ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else []))
- ++ (if !(kernel == "windows") then mapFeatures features ([ ]
- ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []);
- features = mkFeatures (features.clap_2_31_2 or {});
- };
- clap_2_31_2_features = f: updateFeatures f (rec {
- ansi_term_0_11_0.default = true;
- atty_0_2_8.default = true;
- bitflags_1_0_1.default = true;
- clap_2_31_2.ansi_term =
- (f.clap_2_31_2.ansi_term or false) ||
- (f.clap_2_31_2.color or false) ||
- (clap_2_31_2.color or false);
- clap_2_31_2.atty =
- (f.clap_2_31_2.atty or false) ||
- (f.clap_2_31_2.color or false) ||
- (clap_2_31_2.color or false);
- clap_2_31_2.clippy =
- (f.clap_2_31_2.clippy or false) ||
- (f.clap_2_31_2.lints or false) ||
- (clap_2_31_2.lints or false);
- clap_2_31_2.color =
- (f.clap_2_31_2.color or false) ||
- (f.clap_2_31_2.default or false) ||
- (clap_2_31_2.default or false);
- clap_2_31_2.default = (f.clap_2_31_2.default or true);
- clap_2_31_2.strsim =
- (f.clap_2_31_2.strsim or false) ||
- (f.clap_2_31_2.suggestions or false) ||
- (clap_2_31_2.suggestions or false);
- clap_2_31_2.suggestions =
- (f.clap_2_31_2.suggestions or false) ||
- (f.clap_2_31_2.default or false) ||
- (clap_2_31_2.default or false);
- clap_2_31_2.term_size =
- (f.clap_2_31_2.term_size or false) ||
- (f.clap_2_31_2.wrap_help or false) ||
- (clap_2_31_2.wrap_help or false);
- clap_2_31_2.vec_map =
- (f.clap_2_31_2.vec_map or false) ||
- (f.clap_2_31_2.default or false) ||
- (clap_2_31_2.default or false);
- clap_2_31_2.yaml =
- (f.clap_2_31_2.yaml or false) ||
- (f.clap_2_31_2.doc or false) ||
- (clap_2_31_2.doc or false);
- clap_2_31_2.yaml-rust =
- (f.clap_2_31_2.yaml-rust or false) ||
- (f.clap_2_31_2.yaml or false) ||
- (clap_2_31_2.yaml or false);
- strsim_0_7_0.default = true;
- textwrap_0_9_0.default = true;
- textwrap_0_9_0.term_size =
- (f.textwrap_0_9_0.term_size or false) ||
- (clap_2_31_2.wrap_help or false) ||
- (f.clap_2_31_2.wrap_help or false);
- unicode_width_0_1_4.default = true;
- vec_map_0_8_0.default = true;
- }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ];
- dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
- dtoa_0_4_2_features = f: updateFeatures f (rec {
- dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
- }) [];
- either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.either_1_5_0 or {});
- };
- either_1_5_0_features = f: updateFeatures f (rec {
- either_1_5_0.default = (f.either_1_5_0.default or true);
- either_1_5_0.use_std =
- (f.either_1_5_0.use_std or false) ||
- (f.either_1_5_0.default or false) ||
- (either_1_5_0.default or false);
- }) [];
- env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ {
- dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ]
- ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else []));
- features = mkFeatures (features.env_logger_0_5_7 or {});
- };
- env_logger_0_5_7_features = f: updateFeatures f (rec {
- atty_0_2_8.default = true;
- env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true);
- env_logger_0_5_7.regex =
- (f.env_logger_0_5_7.regex or false) ||
- (f.env_logger_0_5_7.default or false) ||
- (env_logger_0_5_7.default or false);
- humantime_1_1_1.default = true;
- log_0_4_1.default = true;
- log_0_4_1.std = true;
- regex_0_2_10.default = true;
- termcolor_0_3_6.default = true;
- }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ];
- error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ {
- dependencies = mapFeatures features ([ ]
- ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else []));
- features = mkFeatures (features.error_chain_0_11_0 or {});
- };
- error_chain_0_11_0_features = f: updateFeatures f (rec {
- backtrace_0_3_6.default = true;
- error_chain_0_11_0.backtrace =
- (f.error_chain_0_11_0.backtrace or false) ||
- (f.error_chain_0_11_0.default or false) ||
- (error_chain_0_11_0.default or false);
- error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true);
- error_chain_0_11_0.example_generated =
- (f.error_chain_0_11_0.example_generated or false) ||
- (f.error_chain_0_11_0.default or false) ||
- (error_chain_0_11_0.default or false);
- }) [ backtrace_0_3_6_features ];
- fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
- dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]);
- };
- fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
- bitflags_1_0_1.default = true;
- fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
- fuchsia_zircon_sys_0_3_3.default = true;
- }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ];
- fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
- fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
- fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
- }) [];
- humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ {
- dependencies = mapFeatures features ([ quick_error_1_2_1 ]);
- };
- humantime_1_1_1_features = f: updateFeatures f (rec {
- humantime_1_1_1.default = (f.humantime_1_1_1.default or true);
- quick_error_1_2_1.default = true;
- }) [ quick_error_1_2_1_features ];
- itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ {
- dependencies = mapFeatures features ([ either_1_5_0 ]);
- features = mkFeatures (features.itertools_0_7_8 or {});
- };
- itertools_0_7_8_features = f: updateFeatures f (rec {
- either_1_5_0.default = (f.either_1_5_0.default or false);
- itertools_0_7_8.default = (f.itertools_0_7_8.default or true);
- itertools_0_7_8.use_std =
- (f.itertools_0_7_8.use_std or false) ||
- (f.itertools_0_7_8.default or false) ||
- (itertools_0_7_8.default or false);
- }) [ either_1_5_0_features ];
- itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ {
- features = mkFeatures (features.itoa_0_4_1 or {});
- };
- itoa_0_4_1_features = f: updateFeatures f (rec {
- itoa_0_4_1.default = (f.itoa_0_4_1.default or true);
- itoa_0_4_1.std =
- (f.itoa_0_4_1.std or false) ||
- (f.itoa_0_4_1.default or false) ||
- (itoa_0_4_1.default or false);
- }) [];
- lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.lazy_static_1_0_0 or {});
- };
- lazy_static_1_0_0_features = f: updateFeatures f (rec {
- lazy_static_1_0_0.compiletest_rs =
- (f.lazy_static_1_0_0.compiletest_rs or false) ||
- (f.lazy_static_1_0_0.compiletest or false) ||
- (lazy_static_1_0_0.compiletest or false);
- lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true);
- lazy_static_1_0_0.nightly =
- (f.lazy_static_1_0_0.nightly or false) ||
- (f.lazy_static_1_0_0.spin_no_std or false) ||
- (lazy_static_1_0_0.spin_no_std or false);
- lazy_static_1_0_0.spin =
- (f.lazy_static_1_0_0.spin or false) ||
- (f.lazy_static_1_0_0.spin_no_std or false) ||
- (lazy_static_1_0_0.spin_no_std or false);
- }) [];
- libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ {
- features = mkFeatures (features.libc_0_2_40 or {});
- };
- libc_0_2_40_features = f: updateFeatures f (rec {
- libc_0_2_40.default = (f.libc_0_2_40.default or true);
- libc_0_2_40.use_std =
- (f.libc_0_2_40.use_std or false) ||
- (f.libc_0_2_40.default or false) ||
- (libc_0_2_40.default or false);
- }) [];
- libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ {
- dependencies = (if abi == "msvc" then mapFeatures features ([]) else []);
- buildDependencies = mapFeatures features ([ ]
- ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else []));
- features = mkFeatures (features.libsqlite3_sys_0_9_1 or {});
- };
- libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec {
- libsqlite3_sys_0_9_1.bindgen =
- (f.libsqlite3_sys_0_9_1.bindgen or false) ||
- (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_1.buildtime_bindgen or false);
- libsqlite3_sys_0_9_1.cc =
- (f.libsqlite3_sys_0_9_1.cc or false) ||
- (f.libsqlite3_sys_0_9_1.bundled or false) ||
- (libsqlite3_sys_0_9_1.bundled or false);
- libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true);
- libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 =
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_1.default or false) ||
- (libsqlite3_sys_0_9_1.default or false);
- libsqlite3_sys_0_9_1.pkg-config =
- (f.libsqlite3_sys_0_9_1.pkg-config or false) ||
- (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
- libsqlite3_sys_0_9_1.vcpkg =
- (f.libsqlite3_sys_0_9_1.vcpkg or false) ||
- (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
- (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
- pkg_config_0_3_9.default = true;
- }) [ pkg_config_0_3_9_features ];
- linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.linked_hash_map_0_4_2 or {});
- };
- linked_hash_map_0_4_2_features = f: updateFeatures f (rec {
- linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true);
- linked_hash_map_0_4_2.heapsize =
- (f.linked_hash_map_0_4_2.heapsize or false) ||
- (f.linked_hash_map_0_4_2.heapsize_impl or false) ||
- (linked_hash_map_0_4_2.heapsize_impl or false);
- linked_hash_map_0_4_2.serde =
- (f.linked_hash_map_0_4_2.serde or false) ||
- (f.linked_hash_map_0_4_2.serde_impl or false) ||
- (linked_hash_map_0_4_2.serde_impl or false);
- linked_hash_map_0_4_2.serde_test =
- (f.linked_hash_map_0_4_2.serde_test or false) ||
- (f.linked_hash_map_0_4_2.serde_impl or false) ||
- (linked_hash_map_0_4_2.serde_impl or false);
- }) [];
- log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ {
- dependencies = mapFeatures features ([ cfg_if_0_1_2 ]);
- features = mkFeatures (features.log_0_4_1 or {});
- };
- log_0_4_1_features = f: updateFeatures f (rec {
- cfg_if_0_1_2.default = true;
- log_0_4_1.default = (f.log_0_4_1.default or true);
- }) [ cfg_if_0_1_2_features ];
- lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ {
- dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]);
- features = mkFeatures (features.lru_cache_0_1_1 or {});
- };
- lru_cache_0_1_1_features = f: updateFeatures f (rec {
- linked_hash_map_0_4_2.default = true;
- linked_hash_map_0_4_2.heapsize_impl =
- (f.linked_hash_map_0_4_2.heapsize_impl or false) ||
- (lru_cache_0_1_1.heapsize_impl or false) ||
- (f.lru_cache_0_1_1.heapsize_impl or false);
- lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true);
- lru_cache_0_1_1.heapsize =
- (f.lru_cache_0_1_1.heapsize or false) ||
- (f.lru_cache_0_1_1.heapsize_impl or false) ||
- (lru_cache_0_1_1.heapsize_impl or false);
- }) [ linked_hash_map_0_4_2_features ];
- memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ {
- dependencies = mapFeatures features ([ ]
- ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else []));
- features = mkFeatures (features.memchr_1_0_2 or {});
- };
- memchr_1_0_2_features = f: updateFeatures f (rec {
- libc_0_2_40.default = (f.libc_0_2_40.default or false);
- libc_0_2_40.use_std =
- (f.libc_0_2_40.use_std or false) ||
- (memchr_1_0_2.use_std or false) ||
- (f.memchr_1_0_2.use_std or false);
- memchr_1_0_2.default = (f.memchr_1_0_2.default or true);
- memchr_1_0_2.libc =
- (f.memchr_1_0_2.libc or false) ||
- (f.memchr_1_0_2.default or false) ||
- (memchr_1_0_2.default or false) ||
- (f.memchr_1_0_2.use_std or false) ||
- (memchr_1_0_2.use_std or false);
- memchr_1_0_2.use_std =
- (f.memchr_1_0_2.use_std or false) ||
- (f.memchr_1_0_2.default or false) ||
- (memchr_1_0_2.default or false);
- }) [ libc_0_2_40_features ];
- memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
- dependencies = mapFeatures features ([ ]
- ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else []));
- features = mkFeatures (features.memchr_2_0_1 or {});
- };
- memchr_2_0_1_features = f: updateFeatures f (rec {
- libc_0_2_40.default = (f.libc_0_2_40.default or false);
- libc_0_2_40.use_std =
- (f.libc_0_2_40.use_std or false) ||
- (memchr_2_0_1.use_std or false) ||
- (f.memchr_2_0_1.use_std or false);
- memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
- memchr_2_0_1.libc =
- (f.memchr_2_0_1.libc or false) ||
- (f.memchr_2_0_1.default or false) ||
- (memchr_2_0_1.default or false) ||
- (f.memchr_2_0_1.use_std or false) ||
- (memchr_2_0_1.use_std or false);
- memchr_2_0_1.use_std =
- (f.memchr_2_0_1.use_std or false) ||
- (f.memchr_2_0_1.default or false) ||
- (memchr_2_0_1.default or false);
- }) [ libc_0_2_40_features ];
- nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ {
- dependencies = mapFeatures features ([ memchr_1_0_2 ]);
- features = mkFeatures (features.nom_3_2_1 or {});
- };
- nom_3_2_1_features = f: updateFeatures f (rec {
- memchr_1_0_2.default = (f.memchr_1_0_2.default or false);
- memchr_1_0_2.use_std =
- (f.memchr_1_0_2.use_std or false) ||
- (nom_3_2_1.std or false) ||
- (f.nom_3_2_1.std or false);
- nom_3_2_1.compiler_error =
- (f.nom_3_2_1.compiler_error or false) ||
- (f.nom_3_2_1.nightly or false) ||
- (nom_3_2_1.nightly or false);
- nom_3_2_1.default = (f.nom_3_2_1.default or true);
- nom_3_2_1.lazy_static =
- (f.nom_3_2_1.lazy_static or false) ||
- (f.nom_3_2_1.regexp_macros or false) ||
- (nom_3_2_1.regexp_macros or false);
- nom_3_2_1.regex =
- (f.nom_3_2_1.regex or false) ||
- (f.nom_3_2_1.regexp or false) ||
- (nom_3_2_1.regexp or false);
- nom_3_2_1.regexp =
- (f.nom_3_2_1.regexp or false) ||
- (f.nom_3_2_1.regexp_macros or false) ||
- (nom_3_2_1.regexp_macros or false);
- nom_3_2_1.std =
- (f.nom_3_2_1.std or false) ||
- (f.nom_3_2_1.default or false) ||
- (nom_3_2_1.default or false);
- nom_3_2_1.stream =
- (f.nom_3_2_1.stream or false) ||
- (f.nom_3_2_1.default or false) ||
- (nom_3_2_1.default or false);
- }) [ memchr_1_0_2_features ];
- num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ {
- features = mkFeatures (features.num_traits_0_2_2 or {});
- };
- num_traits_0_2_2_features = f: updateFeatures f (rec {
- num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true);
- num_traits_0_2_2.std =
- (f.num_traits_0_2_2.std or false) ||
- (f.num_traits_0_2_2.default or false) ||
- (num_traits_0_2_2.default or false);
- }) [];
- pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
- pkg_config_0_3_9_features = f: updateFeatures f (rec {
- pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
- }) [];
- proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ {
- dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
- features = mkFeatures (features.proc_macro2_0_3_6 or {});
- };
- proc_macro2_0_3_6_features = f: updateFeatures f (rec {
- proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true);
- proc_macro2_0_3_6.proc-macro =
- (f.proc_macro2_0_3_6.proc-macro or false) ||
- (f.proc_macro2_0_3_6.default or false) ||
- (proc_macro2_0_3_6.default or false) ||
- (f.proc_macro2_0_3_6.nightly or false) ||
- (proc_macro2_0_3_6.nightly or false);
- unicode_xid_0_1_0.default = true;
- }) [ unicode_xid_0_1_0_features ];
- quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {};
- quick_error_1_2_1_features = f: updateFeatures f (rec {
- quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true);
- }) [];
- quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ {
- dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]);
- features = mkFeatures (features.quote_0_5_1 or {});
- };
- quote_0_5_1_features = f: updateFeatures f (rec {
- proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
- proc_macro2_0_3_6.proc-macro =
- (f.proc_macro2_0_3_6.proc-macro or false) ||
- (quote_0_5_1.proc-macro or false) ||
- (f.quote_0_5_1.proc-macro or false);
- quote_0_5_1.default = (f.quote_0_5_1.default or true);
- quote_0_5_1.proc-macro =
- (f.quote_0_5_1.proc-macro or false) ||
- (f.quote_0_5_1.default or false) ||
- (quote_0_5_1.default or false);
- }) [ proc_macro2_0_3_6_features ];
- rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
- dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
- ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
- ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
- features = mkFeatures (features.rand_0_4_2 or {});
- };
- rand_0_4_2_features = f: updateFeatures f (rec {
- fuchsia_zircon_0_3_3.default = true;
- libc_0_2_40.default = true;
- rand_0_4_2.default = (f.rand_0_4_2.default or true);
- rand_0_4_2.i128_support =
- (f.rand_0_4_2.i128_support or false) ||
- (f.rand_0_4_2.nightly or false) ||
- (rand_0_4_2.nightly or false);
- rand_0_4_2.libc =
- (f.rand_0_4_2.libc or false) ||
- (f.rand_0_4_2.std or false) ||
- (rand_0_4_2.std or false);
- rand_0_4_2.std =
- (f.rand_0_4_2.std or false) ||
- (f.rand_0_4_2.default or false) ||
- (rand_0_4_2.default or false);
- winapi_0_3_4.default = true;
- winapi_0_3_4.minwindef = true;
- winapi_0_3_4.ntsecapi = true;
- winapi_0_3_4.profileapi = true;
- winapi_0_3_4.winnt = true;
- }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
- redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
- redox_syscall_0_1_37_features = f: updateFeatures f (rec {
- redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
- }) [];
- redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
- dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
- };
- redox_termios_0_1_1_features = f: updateFeatures f (rec {
- redox_syscall_0_1_37.default = true;
- redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
- }) [ redox_syscall_0_1_37_features ];
- regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ {
- dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]);
- features = mkFeatures (features.regex_0_2_10 or {});
- };
- regex_0_2_10_features = f: updateFeatures f (rec {
- aho_corasick_0_6_4.default = true;
- memchr_2_0_1.default = true;
- regex_0_2_10.default = (f.regex_0_2_10.default or true);
- regex_0_2_10.pattern =
- (f.regex_0_2_10.pattern or false) ||
- (f.regex_0_2_10.unstable or false) ||
- (regex_0_2_10.unstable or false);
- regex_syntax_0_5_5.default = true;
- thread_local_0_3_5.default = true;
- utf8_ranges_1_0_0.default = true;
- }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ];
- regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ {
- dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
- };
- regex_syntax_0_5_5_features = f: updateFeatures f (rec {
- regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true);
- ucd_util_0_1_1.default = true;
- }) [ ucd_util_0_1_1_features ];
- remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ {
- dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
- };
- remove_dir_all_0_5_0_features = f: updateFeatures f (rec {
- remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true);
- winapi_0_3_4.default = true;
- winapi_0_3_4.errhandlingapi = true;
- winapi_0_3_4.fileapi = true;
- winapi_0_3_4.std = true;
- winapi_0_3_4.winbase = true;
- winapi_0_3_4.winerror = true;
- }) [ winapi_0_3_4_features ];
- rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ {
- dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]);
- features = mkFeatures (features.rusqlite_0_13_0 or {});
- };
- rusqlite_0_13_0_features = f: updateFeatures f (rec {
- bitflags_1_0_1.default = true;
- libsqlite3_sys_0_9_1.buildtime_bindgen =
- (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
- (rusqlite_0_13_0.buildtime_bindgen or false) ||
- (f.rusqlite_0_13_0.buildtime_bindgen or false);
- libsqlite3_sys_0_9_1.bundled =
- (f.libsqlite3_sys_0_9_1.bundled or false) ||
- (rusqlite_0_13_0.bundled or false) ||
- (f.rusqlite_0_13_0.bundled or false);
- libsqlite3_sys_0_9_1.default = true;
- libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 =
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
- (rusqlite_0_13_0.backup or false) ||
- (f.rusqlite_0_13_0.backup or false);
- libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 =
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
- (rusqlite_0_13_0.trace or false) ||
- (f.rusqlite_0_13_0.trace or false);
- libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 =
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
- (rusqlite_0_13_0.functions or false) ||
- (f.rusqlite_0_13_0.functions or false);
- libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 =
- (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
- (rusqlite_0_13_0.blob or false) ||
- (f.rusqlite_0_13_0.blob or false);
- libsqlite3_sys_0_9_1.sqlcipher =
- (f.libsqlite3_sys_0_9_1.sqlcipher or false) ||
- (rusqlite_0_13_0.sqlcipher or false) ||
- (f.rusqlite_0_13_0.sqlcipher or false);
- lru_cache_0_1_1.default = true;
- rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true);
- time_0_1_39.default = true;
- }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ];
- rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {};
- rustc_demangle_0_1_7_features = f: updateFeatures f (rec {
- rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true);
- }) [];
- serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.serde_1_0_38 or {});
- };
- serde_1_0_38_features = f: updateFeatures f (rec {
- serde_1_0_38.default = (f.serde_1_0_38.default or true);
- serde_1_0_38.serde_derive =
- (f.serde_1_0_38.serde_derive or false) ||
- (f.serde_1_0_38.derive or false) ||
- (serde_1_0_38.derive or false) ||
- (f.serde_1_0_38.playground or false) ||
- (serde_1_0_38.playground or false);
- serde_1_0_38.std =
- (f.serde_1_0_38.std or false) ||
- (f.serde_1_0_38.default or false) ||
- (serde_1_0_38.default or false);
- serde_1_0_38.unstable =
- (f.serde_1_0_38.unstable or false) ||
- (f.serde_1_0_38.alloc or false) ||
- (serde_1_0_38.alloc or false);
- }) [];
- serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ {
- dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]);
- features = mkFeatures (features.serde_derive_1_0_38 or {});
- };
- serde_derive_1_0_38_features = f: updateFeatures f (rec {
- proc_macro2_0_3_6.default = true;
- quote_0_5_1.default = true;
- serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true);
- serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false);
- syn_0_13_1.default = true;
- syn_0_13_1.visit = true;
- }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ];
- serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ {
- dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]);
- };
- serde_derive_internals_0_23_1_features = f: updateFeatures f (rec {
- proc_macro2_0_3_6.default = true;
- serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true);
- syn_0_13_1.clone-impls = true;
- syn_0_13_1.default = (f.syn_0_13_1.default or false);
- syn_0_13_1.derive = true;
- syn_0_13_1.parsing = true;
- }) [ proc_macro2_0_3_6_features syn_0_13_1_features ];
- serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ {
- dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]);
- features = mkFeatures (features.serde_json_1_0_14 or {});
- };
- serde_json_1_0_14_features = f: updateFeatures f (rec {
- dtoa_0_4_2.default = true;
- itoa_0_4_1.default = true;
- num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false);
- serde_1_0_38.default = true;
- serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true);
- serde_json_1_0_14.linked-hash-map =
- (f.serde_json_1_0_14.linked-hash-map or false) ||
- (f.serde_json_1_0_14.preserve_order or false) ||
- (serde_json_1_0_14.preserve_order or false);
- }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ];
- strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
- strsim_0_7_0_features = f: updateFeatures f (rec {
- strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
- }) [];
- syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ {
- dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ]
- ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else []));
- features = mkFeatures (features.syn_0_13_1 or {});
- };
- syn_0_13_1_features = f: updateFeatures f (rec {
- proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
- proc_macro2_0_3_6.proc-macro =
- (f.proc_macro2_0_3_6.proc-macro or false) ||
- (syn_0_13_1.proc-macro or false) ||
- (f.syn_0_13_1.proc-macro or false);
- quote_0_5_1.default = (f.quote_0_5_1.default or false);
- quote_0_5_1.proc-macro =
- (f.quote_0_5_1.proc-macro or false) ||
- (syn_0_13_1.proc-macro or false) ||
- (f.syn_0_13_1.proc-macro or false);
- syn_0_13_1.clone-impls =
- (f.syn_0_13_1.clone-impls or false) ||
- (f.syn_0_13_1.default or false) ||
- (syn_0_13_1.default or false);
- syn_0_13_1.default = (f.syn_0_13_1.default or true);
- syn_0_13_1.derive =
- (f.syn_0_13_1.derive or false) ||
- (f.syn_0_13_1.default or false) ||
- (syn_0_13_1.default or false);
- syn_0_13_1.parsing =
- (f.syn_0_13_1.parsing or false) ||
- (f.syn_0_13_1.default or false) ||
- (syn_0_13_1.default or false);
- syn_0_13_1.printing =
- (f.syn_0_13_1.printing or false) ||
- (f.syn_0_13_1.default or false) ||
- (syn_0_13_1.default or false);
- syn_0_13_1.proc-macro =
- (f.syn_0_13_1.proc-macro or false) ||
- (f.syn_0_13_1.default or false) ||
- (syn_0_13_1.default or false);
- syn_0_13_1.quote =
- (f.syn_0_13_1.quote or false) ||
- (f.syn_0_13_1.printing or false) ||
- (syn_0_13_1.printing or false);
- unicode_xid_0_1_0.default = true;
- }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ];
- tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
- dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]);
- };
- tempdir_0_3_7_features = f: updateFeatures f (rec {
- rand_0_4_2.default = true;
- remove_dir_all_0_5_0.default = true;
- tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
- }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ];
- termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ {
- dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []);
- };
- termcolor_0_3_6_features = f: updateFeatures f (rec {
- termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true);
- wincolor_0_1_6.default = true;
- }) [ wincolor_0_1_6_features ];
- termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
- dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
- ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
- };
- termion_1_5_1_features = f: updateFeatures f (rec {
- libc_0_2_40.default = true;
- redox_syscall_0_1_37.default = true;
- redox_termios_0_1_1.default = true;
- termion_1_5_1.default = (f.termion_1_5_1.default or true);
- }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ];
- textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
- dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
- };
- textwrap_0_9_0_features = f: updateFeatures f (rec {
- textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
- unicode_width_0_1_4.default = true;
- }) [ unicode_width_0_1_4_features ];
- thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
- dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
- };
- thread_local_0_3_5_features = f: updateFeatures f (rec {
- lazy_static_1_0_0.default = true;
- thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
- unreachable_1_0_0.default = true;
- }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ];
- time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ {
- dependencies = mapFeatures features ([ libc_0_2_40 ])
- ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else [])
- ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
- };
- time_0_1_39_features = f: updateFeatures f (rec {
- libc_0_2_40.default = true;
- redox_syscall_0_1_37.default = true;
- time_0_1_39.default = (f.time_0_1_39.default or true);
- winapi_0_3_4.default = true;
- winapi_0_3_4.minwinbase = true;
- winapi_0_3_4.minwindef = true;
- winapi_0_3_4.ntdef = true;
- winapi_0_3_4.profileapi = true;
- winapi_0_3_4.std = true;
- winapi_0_3_4.sysinfoapi = true;
- winapi_0_3_4.timezoneapi = true;
- }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ];
- toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
- dependencies = mapFeatures features ([ serde_1_0_38 ]);
- };
- toml_0_4_6_features = f: updateFeatures f (rec {
- serde_1_0_38.default = true;
- toml_0_4_6.default = (f.toml_0_4_6.default or true);
- }) [ serde_1_0_38_features ];
- ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
- ucd_util_0_1_1_features = f: updateFeatures f (rec {
- ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
- }) [];
- unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
- features = mkFeatures (features.unicode_width_0_1_4 or {});
- };
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
- unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
- }) [];
- unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
- features = mkFeatures (features.unicode_xid_0_1_0 or {});
- };
- unicode_xid_0_1_0_features = f: updateFeatures f (rec {
- unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
- }) [];
- unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
- dependencies = mapFeatures features ([ void_1_0_2 ]);
- };
- unreachable_1_0_0_features = f: updateFeatures f (rec {
- unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
- void_1_0_2.default = (f.void_1_0_2.default or false);
- }) [ void_1_0_2_features ];
- utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
- utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
- utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
- }) [];
- vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
- vcpkg_0_2_3_features = f: updateFeatures f (rec {
- vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
- }) [];
- vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
- dependencies = mapFeatures features ([]);
- features = mkFeatures (features.vec_map_0_8_0 or {});
- };
- vec_map_0_8_0_features = f: updateFeatures f (rec {
- vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true);
- vec_map_0_8_0.serde =
- (f.vec_map_0_8_0.serde or false) ||
- (f.vec_map_0_8_0.eders or false) ||
- (vec_map_0_8_0.eders or false);
- vec_map_0_8_0.serde_derive =
- (f.vec_map_0_8_0.serde_derive or false) ||
- (f.vec_map_0_8_0.eders or false) ||
- (vec_map_0_8_0.eders or false);
- }) [];
- void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
- features = mkFeatures (features.void_1_0_2 or {});
- };
- void_1_0_2_features = f: updateFeatures f (rec {
- void_1_0_2.default = (f.void_1_0_2.default or true);
- void_1_0_2.std =
- (f.void_1_0_2.std or false) ||
- (f.void_1_0_2.default or false) ||
- (void_1_0_2.default or false);
- }) [];
- winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
- dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
- ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
- features = mkFeatures (features.winapi_0_3_4 or {});
- };
- winapi_0_3_4_features = f: updateFeatures f (rec {
- winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
- winapi_i686_pc_windows_gnu_0_4_0.default = true;
- winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
- }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
- winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
- winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
- winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
- }) [];
- winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
- winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
- winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
- }) [];
- wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ {
- dependencies = mapFeatures features ([ winapi_0_3_4 ]);
- };
- wincolor_0_1_6_features = f: updateFeatures f (rec {
- winapi_0_3_4.consoleapi = true;
- winapi_0_3_4.default = true;
- winapi_0_3_4.minwindef = true;
- winapi_0_3_4.processenv = true;
- winapi_0_3_4.winbase = true;
- winapi_0_3_4.wincon = true;
- wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true);
- }) [ winapi_0_3_4_features ];
}
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
new file mode 100644
index 00000000000..9d9cafe4cbf
--- /dev/null
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -0,0 +1,2050 @@
+{ lib, buildRustCrate, buildRustCrateHelpers }:
+with buildRustCrateHelpers;
+let inherit (lib.lists) fold;
+ inherit (lib.attrsets) recursiveUpdate;
+in
+rec {
+
+ crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
+ crateName = "aho-corasick";
+ version = "0.6.8";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr";
+ libName = "aho_corasick";
+ crateBin =
+ [{ name = "aho-corasick-dot"; path = "src/main.rs"; }];
+ dependencies = mapFeatures features ([
+ (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
+ ]);
+ };
+ features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec {
+ aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true);
+ memchr."${deps.aho_corasick."0.6.8".memchr}".default = true;
+ }) [
+ (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
+ ];
+
+
+ crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate {
+ crateName = "ansi_term";
+ version = "0.11.0";
+ authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ];
+ sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
+ dependencies = (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec {
+ ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true);
+ winapi = fold recursiveUpdate {} [
+ { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; }
+ { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; }
+ { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; }
+ { "${deps.ansi_term."0.11.0".winapi}".default = true; }
+ ];
+ }) [
+ (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps)
+ ];
+
+
+ crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate {
+ crateName = "argon2rs";
+ version = "0.2.5";
+ authors = [ "bryant " ];
+ sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw";
+ dependencies = mapFeatures features ([
+ (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps)
+ (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps)
+ ]);
+ features = mkFeatures (features."argon2rs"."0.2.5" or {});
+ };
+ features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec {
+ argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true);
+ blake2_rfc = fold recursiveUpdate {} [
+ { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
+ { "0.2.18".simd_asm =
+ (f.blake2_rfc."0.2.18".simd_asm or false) ||
+ (argon2rs."0.2.5"."simd" or false) ||
+ (f."argon2rs"."0.2.5"."simd" or false); }
+ ];
+ scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true;
+ }) [
+ (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps)
+ (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps)
+ ];
+
+
+ crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate {
+ crateName = "arrayvec";
+ version = "0.4.7";
+ authors = [ "bluss" ];
+ sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4";
+ dependencies = mapFeatures features ([
+ (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps)
+ ]);
+ features = mkFeatures (features."arrayvec"."0.4.7" or {});
+ };
+ features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec {
+ arrayvec = fold recursiveUpdate {} [
+ { "0.4.7".default = (f.arrayvec."0.4.7".default or true); }
+ { "0.4.7".serde =
+ (f.arrayvec."0.4.7".serde or false) ||
+ (f.arrayvec."0.4.7".serde-1 or false) ||
+ (arrayvec."0.4.7"."serde-1" or false); }
+ { "0.4.7".std =
+ (f.arrayvec."0.4.7".std or false) ||
+ (f.arrayvec."0.4.7".default or false) ||
+ (arrayvec."0.4.7"."default" or false); }
+ ];
+ nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false);
+ }) [
+ (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps)
+ ];
+
+
+ crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate {
+ crateName = "atty";
+ version = "0.2.11";
+ authors = [ "softprops " ];
+ sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20";
+ dependencies = (if kernel == "redox" then mapFeatures features ([
+ (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps)
+ ]) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+ (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps)
+ ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.atty."0.2.11" = deps: f: updateFeatures f (rec {
+ atty."0.2.11".default = (f.atty."0.2.11".default or true);
+ libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false);
+ termion."${deps.atty."0.2.11".termion}".default = true;
+ winapi = fold recursiveUpdate {} [
+ { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; }
+ { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; }
+ { "${deps.atty."0.2.11".winapi}"."minwindef" = true; }
+ { "${deps.atty."0.2.11".winapi}"."processenv" = true; }
+ { "${deps.atty."0.2.11".winapi}"."winbase" = true; }
+ { "${deps.atty."0.2.11".winapi}".default = true; }
+ ];
+ }) [
+ (features_.termion."${deps."atty"."0.2.11"."termion"}" deps)
+ (features_.libc."${deps."atty"."0.2.11"."libc"}" deps)
+ (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps)
+ ];
+
+
+ crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate {
+ crateName = "backtrace";
+ version = "0.3.9";
+ authors = [ "Alex Crichton " "The Rust Project Developers" ];
+ sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm";
+ dependencies = mapFeatures features ([
+ (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps)
+ (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps)
+ ])
+ ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([
+ ]
+ ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+ (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps)
+ ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([
+ ]
+ ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []);
+ features = mkFeatures (features."backtrace"."0.3.9" or {});
+ };
+ features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec {
+ backtrace = fold recursiveUpdate {} [
+ { "0.3.9".addr2line =
+ (f.backtrace."0.3.9".addr2line or false) ||
+ (f.backtrace."0.3.9".gimli-symbolize or false) ||
+ (backtrace."0.3.9"."gimli-symbolize" or false); }
+ { "0.3.9".backtrace-sys =
+ (f.backtrace."0.3.9".backtrace-sys or false) ||
+ (f.backtrace."0.3.9".libbacktrace or false) ||
+ (backtrace."0.3.9"."libbacktrace" or false); }
+ { "0.3.9".coresymbolication =
+ (f.backtrace."0.3.9".coresymbolication or false) ||
+ (f.backtrace."0.3.9".default or false) ||
+ (backtrace."0.3.9"."default" or false); }
+ { "0.3.9".dbghelp =
+ (f.backtrace."0.3.9".dbghelp or false) ||
+ (f.backtrace."0.3.9".default or false) ||
+ (backtrace."0.3.9"."default" or false); }
+ { "0.3.9".default = (f.backtrace."0.3.9".default or true); }
+ { "0.3.9".dladdr =
+ (f.backtrace."0.3.9".dladdr or false) ||
+ (f.backtrace."0.3.9".default or false) ||
+ (backtrace."0.3.9"."default" or false); }
+ { "0.3.9".findshlibs =
+ (f.backtrace."0.3.9".findshlibs or false) ||
+ (f.backtrace."0.3.9".gimli-symbolize or false) ||
+ (backtrace."0.3.9"."gimli-symbolize" or false); }
+ { "0.3.9".gimli =
+ (f.backtrace."0.3.9".gimli or false) ||
+ (f.backtrace."0.3.9".gimli-symbolize or false) ||
+ (backtrace."0.3.9"."gimli-symbolize" or false); }
+ { "0.3.9".libbacktrace =
+ (f.backtrace."0.3.9".libbacktrace or false) ||
+ (f.backtrace."0.3.9".default or false) ||
+ (backtrace."0.3.9"."default" or false); }
+ { "0.3.9".libunwind =
+ (f.backtrace."0.3.9".libunwind or false) ||
+ (f.backtrace."0.3.9".default or false) ||
+ (backtrace."0.3.9"."default" or false); }
+ { "0.3.9".memmap =
+ (f.backtrace."0.3.9".memmap or false) ||
+ (f.backtrace."0.3.9".gimli-symbolize or false) ||
+ (backtrace."0.3.9"."gimli-symbolize" or false); }
+ { "0.3.9".object =
+ (f.backtrace."0.3.9".object or false) ||
+ (f.backtrace."0.3.9".gimli-symbolize or false) ||
+ (backtrace."0.3.9"."gimli-symbolize" or false); }
+ { "0.3.9".rustc-serialize =
+ (f.backtrace."0.3.9".rustc-serialize or false) ||
+ (f.backtrace."0.3.9".serialize-rustc or false) ||
+ (backtrace."0.3.9"."serialize-rustc" or false); }
+ { "0.3.9".serde =
+ (f.backtrace."0.3.9".serde or false) ||
+ (f.backtrace."0.3.9".serialize-serde or false) ||
+ (backtrace."0.3.9"."serialize-serde" or false); }
+ { "0.3.9".serde_derive =
+ (f.backtrace."0.3.9".serde_derive or false) ||
+ (f.backtrace."0.3.9".serialize-serde or false) ||
+ (backtrace."0.3.9"."serialize-serde" or false); }
+ { "0.3.9".winapi =
+ (f.backtrace."0.3.9".winapi or false) ||
+ (f.backtrace."0.3.9".dbghelp or false) ||
+ (backtrace."0.3.9"."dbghelp" or false); }
+ ];
+ backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true;
+ cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true;
+ libc."${deps.backtrace."0.3.9".libc}".default = true;
+ rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true;
+ winapi = fold recursiveUpdate {} [
+ { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; }
+ { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; }
+ { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; }
+ { "${deps.backtrace."0.3.9".winapi}"."std" = true; }
+ { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; }
+ { "${deps.backtrace."0.3.9".winapi}".default = true; }
+ ];
+ }) [
+ (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps)
+ (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps)
+ (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps)
+ (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps)
+ (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps)
+ ];
+
+
+ crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate {
+ crateName = "backtrace-sys";
+ version = "0.1.24";
+ authors = [ "Alex Crichton " ];
+ sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305";
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+ (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps)
+ ]);
+
+ buildDependencies = mapFeatures features ([
+ (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
+ ]);
+ };
+ features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec {
+ backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true);
+ cc."${deps.backtrace_sys."0.1.24".cc}".default = true;
+ libc."${deps.backtrace_sys."0.1.24".libc}".default = true;
+ }) [
+ (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps)
+ (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
+ ];
+
+
+ crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
+ crateName = "bitflags";
+ version = "1.0.4";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
+ features = mkFeatures (features."bitflags"."1.0.4" or {});
+ };
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
+ }) [];
+
+
+ crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate {
+ crateName = "blake2-rfc";
+ version = "0.2.18";
+ authors = [ "Cesar Eduardo Barros " ];
+ sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l";
+ dependencies = mapFeatures features ([
+ (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps)
+ (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps)
+ ]);
+ features = mkFeatures (features."blake2_rfc"."0.2.18" or {});
+ };
+ features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec {
+ arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false);
+ blake2_rfc = fold recursiveUpdate {} [
+ { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); }
+ { "0.2.18".simd =
+ (f.blake2_rfc."0.2.18".simd or false) ||
+ (f.blake2_rfc."0.2.18".simd_opt or false) ||
+ (blake2_rfc."0.2.18"."simd_opt" or false); }
+ { "0.2.18".simd_opt =
+ (f.blake2_rfc."0.2.18".simd_opt or false) ||
+ (f.blake2_rfc."0.2.18".simd_asm or false) ||
+ (blake2_rfc."0.2.18"."simd_asm" or false); }
+ { "0.2.18".std =
+ (f.blake2_rfc."0.2.18".std or false) ||
+ (f.blake2_rfc."0.2.18".default or false) ||
+ (blake2_rfc."0.2.18"."default" or false); }
+ ];
+ constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true;
+ }) [
+ (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps)
+ (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps)
+ ];
+
+
+ crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate {
+ crateName = "carnix";
+ version = "0.8.11";
+ authors = [ "pe@pijul.org " ];
+ sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch";
+ crateBin =
+ [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++
+ [{ name = "carnix"; path = "src/main.rs"; }];
+ dependencies = mapFeatures features ([
+ (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps)
+ (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps)
+ (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps)
+ (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps)
+ (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps)
+ (crates."log"."${deps."carnix"."0.8.11"."log"}" deps)
+ (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps)
+ (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps)
+ (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps)
+ (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps)
+ (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps)
+ (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps)
+ (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps)
+ (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps)
+ ]);
+ };
+ features_.carnix."0.8.11" = deps: f: updateFeatures f (rec {
+ carnix."0.8.11".default = (f.carnix."0.8.11".default or true);
+ clap."${deps.carnix."0.8.11".clap}".default = true;
+ dirs."${deps.carnix."0.8.11".dirs}".default = true;
+ env_logger."${deps.carnix."0.8.11".env_logger}".default = true;
+ error_chain."${deps.carnix."0.8.11".error_chain}".default = true;
+ itertools."${deps.carnix."0.8.11".itertools}".default = true;
+ log."${deps.carnix."0.8.11".log}".default = true;
+ nom."${deps.carnix."0.8.11".nom}".default = true;
+ regex."${deps.carnix."0.8.11".regex}".default = true;
+ rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true;
+ serde."${deps.carnix."0.8.11".serde}".default = true;
+ serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true;
+ serde_json."${deps.carnix."0.8.11".serde_json}".default = true;
+ tempdir."${deps.carnix."0.8.11".tempdir}".default = true;
+ toml."${deps.carnix."0.8.11".toml}".default = true;
+ }) [
+ (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps)
+ (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps)
+ (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps)
+ (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps)
+ (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps)
+ (features_.log."${deps."carnix"."0.8.11"."log"}" deps)
+ (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps)
+ (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps)
+ (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps)
+ (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps)
+ (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps)
+ (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps)
+ (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps)
+ (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps)
+ ];
+
+
+ crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
+ crateName = "cc";
+ version = "1.0.25";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."cc"."1.0.25" or {});
+ };
+ features_.cc."1.0.25" = deps: f: updateFeatures f (rec {
+ cc = fold recursiveUpdate {} [
+ { "1.0.25".default = (f.cc."1.0.25".default or true); }
+ { "1.0.25".rayon =
+ (f.cc."1.0.25".rayon or false) ||
+ (f.cc."1.0.25".parallel or false) ||
+ (cc."1.0.25"."parallel" or false); }
+ ];
+ }) [];
+
+
+ crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
+ crateName = "cfg-if";
+ version = "0.1.6";
+ authors = [ "Alex Crichton " ];
+ sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
+ };
+ features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+ cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
+ }) [];
+
+
+ crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate {
+ crateName = "clap";
+ version = "2.32.0";
+ authors = [ "Kevin K. " ];
+ sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx";
+ dependencies = mapFeatures features ([
+ (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps)
+ (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps)
+ (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps)
+ ]
+ ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else [])
+ ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else [])
+ ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else []))
+ ++ (if !(kernel == "windows") then mapFeatures features ([
+ ]
+ ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []);
+ features = mkFeatures (features."clap"."2.32.0" or {});
+ };
+ features_.clap."2.32.0" = deps: f: updateFeatures f (rec {
+ ansi_term."${deps.clap."2.32.0".ansi_term}".default = true;
+ atty."${deps.clap."2.32.0".atty}".default = true;
+ bitflags."${deps.clap."2.32.0".bitflags}".default = true;
+ clap = fold recursiveUpdate {} [
+ { "2.32.0".ansi_term =
+ (f.clap."2.32.0".ansi_term or false) ||
+ (f.clap."2.32.0".color or false) ||
+ (clap."2.32.0"."color" or false); }
+ { "2.32.0".atty =
+ (f.clap."2.32.0".atty or false) ||
+ (f.clap."2.32.0".color or false) ||
+ (clap."2.32.0"."color" or false); }
+ { "2.32.0".clippy =
+ (f.clap."2.32.0".clippy or false) ||
+ (f.clap."2.32.0".lints or false) ||
+ (clap."2.32.0"."lints" or false); }
+ { "2.32.0".color =
+ (f.clap."2.32.0".color or false) ||
+ (f.clap."2.32.0".default or false) ||
+ (clap."2.32.0"."default" or false); }
+ { "2.32.0".default = (f.clap."2.32.0".default or true); }
+ { "2.32.0".strsim =
+ (f.clap."2.32.0".strsim or false) ||
+ (f.clap."2.32.0".suggestions or false) ||
+ (clap."2.32.0"."suggestions" or false); }
+ { "2.32.0".suggestions =
+ (f.clap."2.32.0".suggestions or false) ||
+ (f.clap."2.32.0".default or false) ||
+ (clap."2.32.0"."default" or false); }
+ { "2.32.0".term_size =
+ (f.clap."2.32.0".term_size or false) ||
+ (f.clap."2.32.0".wrap_help or false) ||
+ (clap."2.32.0"."wrap_help" or false); }
+ { "2.32.0".vec_map =
+ (f.clap."2.32.0".vec_map or false) ||
+ (f.clap."2.32.0".default or false) ||
+ (clap."2.32.0"."default" or false); }
+ { "2.32.0".yaml =
+ (f.clap."2.32.0".yaml or false) ||
+ (f.clap."2.32.0".doc or false) ||
+ (clap."2.32.0"."doc" or false); }
+ { "2.32.0".yaml-rust =
+ (f.clap."2.32.0".yaml-rust or false) ||
+ (f.clap."2.32.0".yaml or false) ||
+ (clap."2.32.0"."yaml" or false); }
+ ];
+ strsim."${deps.clap."2.32.0".strsim}".default = true;
+ textwrap = fold recursiveUpdate {} [
+ { "${deps.clap."2.32.0".textwrap}".default = true; }
+ { "0.10.0".term_size =
+ (f.textwrap."0.10.0".term_size or false) ||
+ (clap."2.32.0"."wrap_help" or false) ||
+ (f."clap"."2.32.0"."wrap_help" or false); }
+ ];
+ unicode_width."${deps.clap."2.32.0".unicode_width}".default = true;
+ vec_map."${deps.clap."2.32.0".vec_map}".default = true;
+ }) [
+ (features_.atty."${deps."clap"."2.32.0"."atty"}" deps)
+ (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps)
+ (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps)
+ (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps)
+ (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps)
+ (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps)
+ (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps)
+ ];
+
+
+ crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate {
+ crateName = "constant_time_eq";
+ version = "0.1.3";
+ authors = [ "Cesar Eduardo Barros " ];
+ sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd";
+ };
+ features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec {
+ constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true);
+ }) [];
+
+
+ crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate {
+ crateName = "dirs";
+ version = "1.0.4";
+ authors = [ "Simon Ochsenreither " ];
+ sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y";
+ dependencies = (if kernel == "redox" then mapFeatures features ([
+ (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps)
+ ]) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+ (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps)
+ ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.dirs."1.0.4" = deps: f: updateFeatures f (rec {
+ dirs."1.0.4".default = (f.dirs."1.0.4".default or true);
+ libc."${deps.dirs."1.0.4".libc}".default = true;
+ redox_users."${deps.dirs."1.0.4".redox_users}".default = true;
+ winapi = fold recursiveUpdate {} [
+ { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; }
+ { "${deps.dirs."1.0.4".winapi}"."objbase" = true; }
+ { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; }
+ { "${deps.dirs."1.0.4".winapi}"."winbase" = true; }
+ { "${deps.dirs."1.0.4".winapi}"."winerror" = true; }
+ { "${deps.dirs."1.0.4".winapi}".default = true; }
+ ];
+ }) [
+ (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps)
+ (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps)
+ (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps)
+ ];
+
+
+ crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate {
+ crateName = "either";
+ version = "1.5.0";
+ authors = [ "bluss" ];
+ sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."either"."1.5.0" or {});
+ };
+ features_.either."1.5.0" = deps: f: updateFeatures f (rec {
+ either = fold recursiveUpdate {} [
+ { "1.5.0".default = (f.either."1.5.0".default or true); }
+ { "1.5.0".use_std =
+ (f.either."1.5.0".use_std or false) ||
+ (f.either."1.5.0".default or false) ||
+ (either."1.5.0"."default" or false); }
+ ];
+ }) [];
+
+
+ crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate {
+ crateName = "env_logger";
+ version = "0.5.13";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72";
+ dependencies = mapFeatures features ([
+ (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps)
+ (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps)
+ (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps)
+ (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps)
+ ]
+ ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else []));
+ features = mkFeatures (features."env_logger"."0.5.13" or {});
+ };
+ features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec {
+ atty."${deps.env_logger."0.5.13".atty}".default = true;
+ env_logger = fold recursiveUpdate {} [
+ { "0.5.13".default = (f.env_logger."0.5.13".default or true); }
+ { "0.5.13".regex =
+ (f.env_logger."0.5.13".regex or false) ||
+ (f.env_logger."0.5.13".default or false) ||
+ (env_logger."0.5.13"."default" or false); }
+ ];
+ humantime."${deps.env_logger."0.5.13".humantime}".default = true;
+ log = fold recursiveUpdate {} [
+ { "${deps.env_logger."0.5.13".log}"."std" = true; }
+ { "${deps.env_logger."0.5.13".log}".default = true; }
+ ];
+ regex."${deps.env_logger."0.5.13".regex}".default = true;
+ termcolor."${deps.env_logger."0.5.13".termcolor}".default = true;
+ }) [
+ (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps)
+ (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps)
+ (features_.log."${deps."env_logger"."0.5.13"."log"}" deps)
+ (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps)
+ (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps)
+ ];
+
+
+ crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate {
+ crateName = "error-chain";
+ version = "0.12.0";
+ authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ];
+ sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl";
+ dependencies = mapFeatures features ([
+ ]
+ ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []));
+ features = mkFeatures (features."error_chain"."0.12.0" or {});
+ };
+ features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec {
+ backtrace."${deps.error_chain."0.12.0".backtrace}".default = true;
+ error_chain = fold recursiveUpdate {} [
+ { "0.12.0".backtrace =
+ (f.error_chain."0.12.0".backtrace or false) ||
+ (f.error_chain."0.12.0".default or false) ||
+ (error_chain."0.12.0"."default" or false); }
+ { "0.12.0".default = (f.error_chain."0.12.0".default or true); }
+ { "0.12.0".example_generated =
+ (f.error_chain."0.12.0".example_generated or false) ||
+ (f.error_chain."0.12.0".default or false) ||
+ (error_chain."0.12.0"."default" or false); }
+ ];
+ }) [
+ (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps)
+ ];
+
+
+ crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate {
+ crateName = "failure";
+ version = "0.1.3";
+ authors = [ "Without Boats " ];
+ sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s";
+ dependencies = mapFeatures features ([
+ ]
+ ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])
+ ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else []));
+ features = mkFeatures (features."failure"."0.1.3" or {});
+ };
+ features_.failure."0.1.3" = deps: f: updateFeatures f (rec {
+ backtrace."${deps.failure."0.1.3".backtrace}".default = true;
+ failure = fold recursiveUpdate {} [
+ { "0.1.3".backtrace =
+ (f.failure."0.1.3".backtrace or false) ||
+ (f.failure."0.1.3".std or false) ||
+ (failure."0.1.3"."std" or false); }
+ { "0.1.3".default = (f.failure."0.1.3".default or true); }
+ { "0.1.3".derive =
+ (f.failure."0.1.3".derive or false) ||
+ (f.failure."0.1.3".default or false) ||
+ (failure."0.1.3"."default" or false); }
+ { "0.1.3".failure_derive =
+ (f.failure."0.1.3".failure_derive or false) ||
+ (f.failure."0.1.3".derive or false) ||
+ (failure."0.1.3"."derive" or false); }
+ { "0.1.3".std =
+ (f.failure."0.1.3".std or false) ||
+ (f.failure."0.1.3".default or false) ||
+ (failure."0.1.3"."default" or false); }
+ ];
+ failure_derive."${deps.failure."0.1.3".failure_derive}".default = true;
+ }) [
+ (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps)
+ (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps)
+ ];
+
+
+ crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate {
+ crateName = "failure_derive";
+ version = "0.1.3";
+ authors = [ "Without Boats " ];
+ sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm";
+ procMacro = true;
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+ (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps)
+ (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps)
+ (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps)
+ (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps)
+ ]);
+ features = mkFeatures (features."failure_derive"."0.1.3" or {});
+ };
+ features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec {
+ failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true);
+ proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true;
+ quote."${deps.failure_derive."0.1.3".quote}".default = true;
+ syn."${deps.failure_derive."0.1.3".syn}".default = true;
+ synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true;
+ }) [
+ (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps)
+ (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps)
+ (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps)
+ (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps)
+ ];
+
+
+ crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
+ crateName = "fuchsia-zircon";
+ version = "0.3.3";
+ authors = [ "Raph Levien " ];
+ sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
+ dependencies = mapFeatures features ([
+ (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps)
+ (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
+ ]);
+ };
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
+ fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
+ fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
+ }) [
+ (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps)
+ (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
+ ];
+
+
+ crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
+ crateName = "fuchsia-zircon-sys";
+ version = "0.3.3";
+ authors = [ "Raph Levien " ];
+ sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
+ };
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
+ }) [];
+
+
+ crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate {
+ crateName = "humantime";
+ version = "1.1.1";
+ authors = [ "Paul Colomiets " ];
+ sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn";
+ libPath = "src/lib.rs";
+ dependencies = mapFeatures features ([
+ (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps)
+ ]);
+ };
+ features_.humantime."1.1.1" = deps: f: updateFeatures f (rec {
+ humantime."1.1.1".default = (f.humantime."1.1.1".default or true);
+ quick_error."${deps.humantime."1.1.1".quick_error}".default = true;
+ }) [
+ (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps)
+ ];
+
+
+ crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate {
+ crateName = "itertools";
+ version = "0.7.8";
+ authors = [ "bluss" ];
+ sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357";
+ dependencies = mapFeatures features ([
+ (crates."either"."${deps."itertools"."0.7.8"."either"}" deps)
+ ]);
+ features = mkFeatures (features."itertools"."0.7.8" or {});
+ };
+ features_.itertools."0.7.8" = deps: f: updateFeatures f (rec {
+ either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false);
+ itertools = fold recursiveUpdate {} [
+ { "0.7.8".default = (f.itertools."0.7.8".default or true); }
+ { "0.7.8".use_std =
+ (f.itertools."0.7.8".use_std or false) ||
+ (f.itertools."0.7.8".default or false) ||
+ (itertools."0.7.8"."default" or false); }
+ ];
+ }) [
+ (features_.either."${deps."itertools"."0.7.8"."either"}" deps)
+ ];
+
+
+ crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate {
+ crateName = "itoa";
+ version = "0.4.3";
+ authors = [ "David Tolnay " ];
+ sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1";
+ features = mkFeatures (features."itoa"."0.4.3" or {});
+ };
+ features_.itoa."0.4.3" = deps: f: updateFeatures f (rec {
+ itoa = fold recursiveUpdate {} [
+ { "0.4.3".default = (f.itoa."0.4.3".default or true); }
+ { "0.4.3".std =
+ (f.itoa."0.4.3".std or false) ||
+ (f.itoa."0.4.3".default or false) ||
+ (itoa."0.4.3"."default" or false); }
+ ];
+ }) [];
+
+
+ crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate {
+ crateName = "lazy_static";
+ version = "1.1.0";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0";
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+]);
+
+ buildDependencies = mapFeatures features ([
+ (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps)
+ ]);
+ features = mkFeatures (features."lazy_static"."1.1.0" or {});
+ };
+ features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec {
+ lazy_static = fold recursiveUpdate {} [
+ { "1.1.0".default = (f.lazy_static."1.1.0".default or true); }
+ { "1.1.0".nightly =
+ (f.lazy_static."1.1.0".nightly or false) ||
+ (f.lazy_static."1.1.0".spin_no_std or false) ||
+ (lazy_static."1.1.0"."spin_no_std" or false); }
+ { "1.1.0".spin =
+ (f.lazy_static."1.1.0".spin or false) ||
+ (f.lazy_static."1.1.0".spin_no_std or false) ||
+ (lazy_static."1.1.0"."spin_no_std" or false); }
+ ];
+ version_check."${deps.lazy_static."1.1.0".version_check}".default = true;
+ }) [
+ (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps)
+ ];
+
+
+ crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate {
+ crateName = "libc";
+ version = "0.2.43";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b";
+ features = mkFeatures (features."libc"."0.2.43" or {});
+ };
+ features_.libc."0.2.43" = deps: f: updateFeatures f (rec {
+ libc = fold recursiveUpdate {} [
+ { "0.2.43".default = (f.libc."0.2.43".default or true); }
+ { "0.2.43".use_std =
+ (f.libc."0.2.43".use_std or false) ||
+ (f.libc."0.2.43".default or false) ||
+ (libc."0.2.43"."default" or false); }
+ ];
+ }) [];
+
+
+ crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate {
+ crateName = "libsqlite3-sys";
+ version = "0.9.3";
+ authors = [ "John Gallagher " ];
+ sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021";
+ build = "build.rs";
+ dependencies = (if abi == "msvc" then mapFeatures features ([
+]) else []);
+
+ buildDependencies = mapFeatures features ([
+ ]
+ ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else []));
+ features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {});
+ };
+ features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec {
+ libsqlite3_sys = fold recursiveUpdate {} [
+ { "0.9.3".bindgen =
+ (f.libsqlite3_sys."0.9.3".bindgen or false) ||
+ (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
+ (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); }
+ { "0.9.3".cc =
+ (f.libsqlite3_sys."0.9.3".cc or false) ||
+ (f.libsqlite3_sys."0.9.3".bundled or false) ||
+ (libsqlite3_sys."0.9.3"."bundled" or false); }
+ { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); }
+ { "0.9.3".min_sqlite_version_3_6_8 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
+ (f.libsqlite3_sys."0.9.3".default or false) ||
+ (libsqlite3_sys."0.9.3"."default" or false); }
+ { "0.9.3".pkg-config =
+ (f.libsqlite3_sys."0.9.3".pkg-config or false) ||
+ (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
+ (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
+ { "0.9.3".vcpkg =
+ (f.libsqlite3_sys."0.9.3".vcpkg or false) ||
+ (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
+ (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
+ (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
+ ];
+ pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true;
+ }) [
+ (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps)
+ ];
+
+
+ crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate {
+ crateName = "linked-hash-map";
+ version = "0.4.2";
+ authors = [ "Stepan Koltsov " "Andrew Paseltiner " ];
+ sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."linked_hash_map"."0.4.2" or {});
+ };
+ features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec {
+ linked_hash_map = fold recursiveUpdate {} [
+ { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); }
+ { "0.4.2".heapsize =
+ (f.linked_hash_map."0.4.2".heapsize or false) ||
+ (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
+ (linked_hash_map."0.4.2"."heapsize_impl" or false); }
+ { "0.4.2".serde =
+ (f.linked_hash_map."0.4.2".serde or false) ||
+ (f.linked_hash_map."0.4.2".serde_impl or false) ||
+ (linked_hash_map."0.4.2"."serde_impl" or false); }
+ { "0.4.2".serde_test =
+ (f.linked_hash_map."0.4.2".serde_test or false) ||
+ (f.linked_hash_map."0.4.2".serde_impl or false) ||
+ (linked_hash_map."0.4.2"."serde_impl" or false); }
+ ];
+ }) [];
+
+
+ crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate {
+ crateName = "log";
+ version = "0.4.5";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6";
+ dependencies = mapFeatures features ([
+ (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps)
+ ]);
+ features = mkFeatures (features."log"."0.4.5" or {});
+ };
+ features_.log."0.4.5" = deps: f: updateFeatures f (rec {
+ cfg_if."${deps.log."0.4.5".cfg_if}".default = true;
+ log."0.4.5".default = (f.log."0.4.5".default or true);
+ }) [
+ (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps)
+ ];
+
+
+ crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate {
+ crateName = "lru-cache";
+ version = "0.1.1";
+ authors = [ "Stepan Koltsov " ];
+ sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
+ dependencies = mapFeatures features ([
+ (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
+ ]);
+ features = mkFeatures (features."lru_cache"."0.1.1" or {});
+ };
+ features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec {
+ linked_hash_map = fold recursiveUpdate {} [
+ { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; }
+ { "0.4.2".heapsize_impl =
+ (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
+ (lru_cache."0.1.1"."heapsize_impl" or false) ||
+ (f."lru_cache"."0.1.1"."heapsize_impl" or false); }
+ ];
+ lru_cache = fold recursiveUpdate {} [
+ { "0.1.1".default = (f.lru_cache."0.1.1".default or true); }
+ { "0.1.1".heapsize =
+ (f.lru_cache."0.1.1".heapsize or false) ||
+ (f.lru_cache."0.1.1".heapsize_impl or false) ||
+ (lru_cache."0.1.1"."heapsize_impl" or false); }
+ ];
+ }) [
+ (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
+ ];
+
+
+ crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate {
+ crateName = "memchr";
+ version = "1.0.2";
+ authors = [ "Andrew Gallant " "bluss" ];
+ sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
+ dependencies = mapFeatures features ([
+ ]
+ ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+ features = mkFeatures (features."memchr"."1.0.2" or {});
+ };
+ features_.memchr."1.0.2" = deps: f: updateFeatures f (rec {
+ libc = fold recursiveUpdate {} [
+ { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
+ { "0.2.43".use_std =
+ (f.libc."0.2.43".use_std or false) ||
+ (memchr."1.0.2"."use_std" or false) ||
+ (f."memchr"."1.0.2"."use_std" or false); }
+ ];
+ memchr = fold recursiveUpdate {} [
+ { "1.0.2".default = (f.memchr."1.0.2".default or true); }
+ { "1.0.2".libc =
+ (f.memchr."1.0.2".libc or false) ||
+ (f.memchr."1.0.2".default or false) ||
+ (memchr."1.0.2"."default" or false) ||
+ (f.memchr."1.0.2".use_std or false) ||
+ (memchr."1.0.2"."use_std" or false); }
+ { "1.0.2".use_std =
+ (f.memchr."1.0.2".use_std or false) ||
+ (f.memchr."1.0.2".default or false) ||
+ (memchr."1.0.2"."default" or false); }
+ ];
+ }) [
+ (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps)
+ ];
+
+
+ crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate {
+ crateName = "memchr";
+ version = "2.1.0";
+ authors = [ "Andrew Gallant " "bluss" ];
+ sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq";
+ dependencies = mapFeatures features ([
+ (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps)
+ ]
+ ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+
+ buildDependencies = mapFeatures features ([
+ (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps)
+ ]);
+ features = mkFeatures (features."memchr"."2.1.0" or {});
+ };
+ features_.memchr."2.1.0" = deps: f: updateFeatures f (rec {
+ cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true;
+ libc = fold recursiveUpdate {} [
+ { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
+ { "0.2.43".use_std =
+ (f.libc."0.2.43".use_std or false) ||
+ (memchr."2.1.0"."use_std" or false) ||
+ (f."memchr"."2.1.0"."use_std" or false); }
+ ];
+ memchr = fold recursiveUpdate {} [
+ { "2.1.0".default = (f.memchr."2.1.0".default or true); }
+ { "2.1.0".libc =
+ (f.memchr."2.1.0".libc or false) ||
+ (f.memchr."2.1.0".default or false) ||
+ (memchr."2.1.0"."default" or false) ||
+ (f.memchr."2.1.0".use_std or false) ||
+ (memchr."2.1.0"."use_std" or false); }
+ { "2.1.0".use_std =
+ (f.memchr."2.1.0".use_std or false) ||
+ (f.memchr."2.1.0".default or false) ||
+ (memchr."2.1.0"."default" or false); }
+ ];
+ version_check."${deps.memchr."2.1.0".version_check}".default = true;
+ }) [
+ (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps)
+ (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps)
+ (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps)
+ ];
+
+
+ crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate {
+ crateName = "nodrop";
+ version = "0.1.12";
+ authors = [ "bluss" ];
+ sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."nodrop"."0.1.12" or {});
+ };
+ features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec {
+ nodrop = fold recursiveUpdate {} [
+ { "0.1.12".default = (f.nodrop."0.1.12".default or true); }
+ { "0.1.12".nodrop-union =
+ (f.nodrop."0.1.12".nodrop-union or false) ||
+ (f.nodrop."0.1.12".use_union or false) ||
+ (nodrop."0.1.12"."use_union" or false); }
+ { "0.1.12".std =
+ (f.nodrop."0.1.12".std or false) ||
+ (f.nodrop."0.1.12".default or false) ||
+ (nodrop."0.1.12"."default" or false); }
+ ];
+ }) [];
+
+
+ crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate {
+ crateName = "nom";
+ version = "3.2.1";
+ authors = [ "contact@geoffroycouprie.com" ];
+ sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07";
+ dependencies = mapFeatures features ([
+ (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps)
+ ]);
+ features = mkFeatures (features."nom"."3.2.1" or {});
+ };
+ features_.nom."3.2.1" = deps: f: updateFeatures f (rec {
+ memchr = fold recursiveUpdate {} [
+ { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
+ { "1.0.2".use_std =
+ (f.memchr."1.0.2".use_std or false) ||
+ (nom."3.2.1"."std" or false) ||
+ (f."nom"."3.2.1"."std" or false); }
+ ];
+ nom = fold recursiveUpdate {} [
+ { "3.2.1".compiler_error =
+ (f.nom."3.2.1".compiler_error or false) ||
+ (f.nom."3.2.1".nightly or false) ||
+ (nom."3.2.1"."nightly" or false); }
+ { "3.2.1".default = (f.nom."3.2.1".default or true); }
+ { "3.2.1".lazy_static =
+ (f.nom."3.2.1".lazy_static or false) ||
+ (f.nom."3.2.1".regexp_macros or false) ||
+ (nom."3.2.1"."regexp_macros" or false); }
+ { "3.2.1".regex =
+ (f.nom."3.2.1".regex or false) ||
+ (f.nom."3.2.1".regexp or false) ||
+ (nom."3.2.1"."regexp" or false); }
+ { "3.2.1".regexp =
+ (f.nom."3.2.1".regexp or false) ||
+ (f.nom."3.2.1".regexp_macros or false) ||
+ (nom."3.2.1"."regexp_macros" or false); }
+ { "3.2.1".std =
+ (f.nom."3.2.1".std or false) ||
+ (f.nom."3.2.1".default or false) ||
+ (nom."3.2.1"."default" or false); }
+ { "3.2.1".stream =
+ (f.nom."3.2.1".stream or false) ||
+ (f.nom."3.2.1".default or false) ||
+ (nom."3.2.1"."default" or false); }
+ ];
+ }) [
+ (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps)
+ ];
+
+
+ crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
+ crateName = "pkg-config";
+ version = "0.3.14";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
+ };
+ features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
+ pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
+ }) [];
+
+
+ crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate {
+ crateName = "proc-macro2";
+ version = "0.4.20";
+ authors = [ "Alex Crichton " ];
+ sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2";
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+ (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps)
+ ]);
+ features = mkFeatures (features."proc_macro2"."0.4.20" or {});
+ };
+ features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec {
+ proc_macro2 = fold recursiveUpdate {} [
+ { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); }
+ { "0.4.20".proc-macro =
+ (f.proc_macro2."0.4.20".proc-macro or false) ||
+ (f.proc_macro2."0.4.20".default or false) ||
+ (proc_macro2."0.4.20"."default" or false) ||
+ (f.proc_macro2."0.4.20".nightly or false) ||
+ (proc_macro2."0.4.20"."nightly" or false); }
+ ];
+ unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true;
+ }) [
+ (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps)
+ ];
+
+
+ crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate {
+ crateName = "quick-error";
+ version = "1.2.2";
+ authors = [ "Paul Colomiets " "Colin Kiegel " ];
+ sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5";
+ };
+ features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec {
+ quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true);
+ }) [];
+
+
+ crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate {
+ crateName = "quote";
+ version = "0.6.8";
+ authors = [ "David Tolnay " ];
+ sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh";
+ dependencies = mapFeatures features ([
+ (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps)
+ ]);
+ features = mkFeatures (features."quote"."0.6.8" or {});
+ };
+ features_.quote."0.6.8" = deps: f: updateFeatures f (rec {
+ proc_macro2 = fold recursiveUpdate {} [
+ { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
+ { "0.4.20".proc-macro =
+ (f.proc_macro2."0.4.20".proc-macro or false) ||
+ (quote."0.6.8"."proc-macro" or false) ||
+ (f."quote"."0.6.8"."proc-macro" or false); }
+ ];
+ quote = fold recursiveUpdate {} [
+ { "0.6.8".default = (f.quote."0.6.8".default or true); }
+ { "0.6.8".proc-macro =
+ (f.quote."0.6.8".proc-macro or false) ||
+ (f.quote."0.6.8".default or false) ||
+ (quote."0.6.8"."default" or false); }
+ ];
+ }) [
+ (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps)
+ ];
+
+
+ crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
+ crateName = "rand";
+ version = "0.4.3";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f";
+ dependencies = (if kernel == "fuchsia" then mapFeatures features ([
+ (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps)
+ ]) else [])
+ ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+ ]
+ ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
+ ]) else []);
+ features = mkFeatures (features."rand"."0.4.3" or {});
+ };
+ features_.rand."0.4.3" = deps: f: updateFeatures f (rec {
+ fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true;
+ libc."${deps.rand."0.4.3".libc}".default = true;
+ rand = fold recursiveUpdate {} [
+ { "0.4.3".default = (f.rand."0.4.3".default or true); }
+ { "0.4.3".i128_support =
+ (f.rand."0.4.3".i128_support or false) ||
+ (f.rand."0.4.3".nightly or false) ||
+ (rand."0.4.3"."nightly" or false); }
+ { "0.4.3".libc =
+ (f.rand."0.4.3".libc or false) ||
+ (f.rand."0.4.3".std or false) ||
+ (rand."0.4.3"."std" or false); }
+ { "0.4.3".std =
+ (f.rand."0.4.3".std or false) ||
+ (f.rand."0.4.3".default or false) ||
+ (rand."0.4.3"."default" or false); }
+ ];
+ winapi = fold recursiveUpdate {} [
+ { "${deps.rand."0.4.3".winapi}"."minwindef" = true; }
+ { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; }
+ { "${deps.rand."0.4.3".winapi}"."profileapi" = true; }
+ { "${deps.rand."0.4.3".winapi}"."winnt" = true; }
+ { "${deps.rand."0.4.3".winapi}".default = true; }
+ ];
+ }) [
+ (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps)
+ (features_.libc."${deps."rand"."0.4.3"."libc"}" deps)
+ (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps)
+ ];
+
+
+ crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate {
+ crateName = "redox_syscall";
+ version = "0.1.40";
+ authors = [ "Jeremy Soller " ];
+ sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
+ libName = "syscall";
+ };
+ features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec {
+ redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true);
+ }) [];
+
+
+ crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate {
+ crateName = "redox_termios";
+ version = "0.1.1";
+ authors = [ "Jeremy Soller " ];
+ sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
+ libPath = "src/lib.rs";
+ dependencies = mapFeatures features ([
+ (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
+ ]);
+ };
+ features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+ redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
+ redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
+ }) [
+ (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
+ ];
+
+
+ crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate {
+ crateName = "redox_users";
+ version = "0.2.0";
+ authors = [ "Jose Narvaez " "Wesley Hershberger " ];
+ sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf";
+ dependencies = mapFeatures features ([
+ (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps)
+ (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps)
+ (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps)
+ (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
+ ]);
+ };
+ features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec {
+ argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false);
+ failure."${deps.redox_users."0.2.0".failure}".default = true;
+ rand."${deps.redox_users."0.2.0".rand}".default = true;
+ redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true;
+ redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true);
+ }) [
+ (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps)
+ (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps)
+ (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps)
+ (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
+ ];
+
+
+ crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate {
+ crateName = "regex";
+ version = "1.0.5";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02";
+ dependencies = mapFeatures features ([
+ (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps)
+ (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps)
+ (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps)
+ (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps)
+ (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps)
+ ]);
+ features = mkFeatures (features."regex"."1.0.5" or {});
+ };
+ features_.regex."1.0.5" = deps: f: updateFeatures f (rec {
+ aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true;
+ memchr."${deps.regex."1.0.5".memchr}".default = true;
+ regex = fold recursiveUpdate {} [
+ { "1.0.5".default = (f.regex."1.0.5".default or true); }
+ { "1.0.5".pattern =
+ (f.regex."1.0.5".pattern or false) ||
+ (f.regex."1.0.5".unstable or false) ||
+ (regex."1.0.5"."unstable" or false); }
+ { "1.0.5".use_std =
+ (f.regex."1.0.5".use_std or false) ||
+ (f.regex."1.0.5".default or false) ||
+ (regex."1.0.5"."default" or false); }
+ ];
+ regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true;
+ thread_local."${deps.regex."1.0.5".thread_local}".default = true;
+ utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true;
+ }) [
+ (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps)
+ (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps)
+ (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps)
+ (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps)
+ (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps)
+ ];
+
+
+ crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate {
+ crateName = "regex-syntax";
+ version = "0.6.2";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw";
+ dependencies = mapFeatures features ([
+ (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
+ ]);
+ };
+ features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec {
+ regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true);
+ ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true;
+ }) [
+ (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
+ ];
+
+
+ crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate {
+ crateName = "remove_dir_all";
+ version = "0.5.1";
+ authors = [ "Aaronepower " ];
+ sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7";
+ dependencies = (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+ remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
+ winapi = fold recursiveUpdate {} [
+ { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
+ { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; }
+ { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; }
+ { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; }
+ { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; }
+ { "${deps.remove_dir_all."0.5.1".winapi}".default = true; }
+ ];
+ }) [
+ (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
+ ];
+
+
+ crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate {
+ crateName = "rusqlite";
+ version = "0.14.0";
+ authors = [ "John Gallagher " ];
+ sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq";
+ dependencies = mapFeatures features ([
+ (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
+ (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
+ (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
+ (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps)
+ ]);
+ features = mkFeatures (features."rusqlite"."0.14.0" or {});
+ };
+ features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec {
+ bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true;
+ libsqlite3_sys = fold recursiveUpdate {} [
+ { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; }
+ { "0.9.3".buildtime_bindgen =
+ (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
+ (rusqlite."0.14.0"."buildtime_bindgen" or false) ||
+ (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); }
+ { "0.9.3".bundled =
+ (f.libsqlite3_sys."0.9.3".bundled or false) ||
+ (rusqlite."0.14.0"."bundled" or false) ||
+ (f."rusqlite"."0.14.0"."bundled" or false); }
+ { "0.9.3".min_sqlite_version_3_6_11 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
+ (rusqlite."0.14.0"."backup" or false) ||
+ (f."rusqlite"."0.14.0"."backup" or false); }
+ { "0.9.3".min_sqlite_version_3_6_23 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
+ (rusqlite."0.14.0"."trace" or false) ||
+ (f."rusqlite"."0.14.0"."trace" or false); }
+ { "0.9.3".min_sqlite_version_3_7_3 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
+ (rusqlite."0.14.0"."functions" or false) ||
+ (f."rusqlite"."0.14.0"."functions" or false); }
+ { "0.9.3".min_sqlite_version_3_7_4 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
+ (rusqlite."0.14.0"."blob" or false) ||
+ (f."rusqlite"."0.14.0"."blob" or false); }
+ { "0.9.3".min_sqlite_version_3_7_7 =
+ (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
+ (rusqlite."0.14.0"."vtab" or false) ||
+ (f."rusqlite"."0.14.0"."vtab" or false); }
+ { "0.9.3".sqlcipher =
+ (f.libsqlite3_sys."0.9.3".sqlcipher or false) ||
+ (rusqlite."0.14.0"."sqlcipher" or false) ||
+ (f."rusqlite"."0.14.0"."sqlcipher" or false); }
+ { "0.9.3".unlock_notify =
+ (f.libsqlite3_sys."0.9.3".unlock_notify or false) ||
+ (rusqlite."0.14.0"."unlock_notify" or false) ||
+ (f."rusqlite"."0.14.0"."unlock_notify" or false); }
+ ];
+ lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true;
+ rusqlite = fold recursiveUpdate {} [
+ { "0.14.0".bundled =
+ (f.rusqlite."0.14.0".bundled or false) ||
+ (f.rusqlite."0.14.0".array or false) ||
+ (rusqlite."0.14.0"."array" or false); }
+ { "0.14.0".csv =
+ (f.rusqlite."0.14.0".csv or false) ||
+ (f.rusqlite."0.14.0".csvtab or false) ||
+ (rusqlite."0.14.0"."csvtab" or false); }
+ { "0.14.0".default = (f.rusqlite."0.14.0".default or true); }
+ { "0.14.0".lazy_static =
+ (f.rusqlite."0.14.0".lazy_static or false) ||
+ (f.rusqlite."0.14.0".vtab or false) ||
+ (rusqlite."0.14.0"."vtab" or false); }
+ { "0.14.0".vtab =
+ (f.rusqlite."0.14.0".vtab or false) ||
+ (f.rusqlite."0.14.0".array or false) ||
+ (rusqlite."0.14.0"."array" or false) ||
+ (f.rusqlite."0.14.0".csvtab or false) ||
+ (rusqlite."0.14.0"."csvtab" or false); }
+ ];
+ time."${deps.rusqlite."0.14.0".time}".default = true;
+ }) [
+ (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
+ (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
+ (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
+ (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps)
+ ];
+
+
+ crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate {
+ crateName = "rustc-demangle";
+ version = "0.1.9";
+ authors = [ "Alex Crichton " ];
+ sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
+ };
+ features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec {
+ rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true);
+ }) [];
+
+
+ crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate {
+ crateName = "ryu";
+ version = "0.2.6";
+ authors = [ "David Tolnay " ];
+ sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr";
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."ryu"."0.2.6" or {});
+ };
+ features_.ryu."0.2.6" = deps: f: updateFeatures f (rec {
+ ryu."0.2.6".default = (f.ryu."0.2.6".default or true);
+ }) [];
+
+
+ crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate {
+ crateName = "scoped_threadpool";
+ version = "0.1.9";
+ authors = [ "Marvin Löbel " ];
+ sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v";
+ features = mkFeatures (features."scoped_threadpool"."0.1.9" or {});
+ };
+ features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+ scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true);
+ }) [];
+
+
+ crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate {
+ crateName = "serde";
+ version = "1.0.80";
+ authors = [ "Erick Tryzelaar " "David Tolnay " ];
+ sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz";
+ build = "build.rs";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."serde"."1.0.80" or {});
+ };
+ features_.serde."1.0.80" = deps: f: updateFeatures f (rec {
+ serde = fold recursiveUpdate {} [
+ { "1.0.80".default = (f.serde."1.0.80".default or true); }
+ { "1.0.80".serde_derive =
+ (f.serde."1.0.80".serde_derive or false) ||
+ (f.serde."1.0.80".derive or false) ||
+ (serde."1.0.80"."derive" or false); }
+ { "1.0.80".std =
+ (f.serde."1.0.80".std or false) ||
+ (f.serde."1.0.80".default or false) ||
+ (serde."1.0.80"."default" or false); }
+ { "1.0.80".unstable =
+ (f.serde."1.0.80".unstable or false) ||
+ (f.serde."1.0.80".alloc or false) ||
+ (serde."1.0.80"."alloc" or false); }
+ ];
+ }) [];
+
+
+ crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate {
+ crateName = "serde_derive";
+ version = "1.0.80";
+ authors = [ "Erick Tryzelaar " "David Tolnay " ];
+ sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky";
+ procMacro = true;
+ dependencies = mapFeatures features ([
+ (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps)
+ (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps)
+ (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps)
+ ]);
+ features = mkFeatures (features."serde_derive"."1.0.80" or {});
+ };
+ features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec {
+ proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true;
+ quote."${deps.serde_derive."1.0.80".quote}".default = true;
+ serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true);
+ syn = fold recursiveUpdate {} [
+ { "${deps.serde_derive."1.0.80".syn}"."visit" = true; }
+ { "${deps.serde_derive."1.0.80".syn}".default = true; }
+ ];
+ }) [
+ (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps)
+ (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps)
+ (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps)
+ ];
+
+
+ crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate {
+ crateName = "serde_json";
+ version = "1.0.32";
+ authors = [ "Erick Tryzelaar " "David Tolnay " ];
+ sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0";
+ dependencies = mapFeatures features ([
+ (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps)
+ (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps)
+ (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps)
+ ]);
+ features = mkFeatures (features."serde_json"."1.0.32" or {});
+ };
+ features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec {
+ itoa."${deps.serde_json."1.0.32".itoa}".default = true;
+ ryu."${deps.serde_json."1.0.32".ryu}".default = true;
+ serde."${deps.serde_json."1.0.32".serde}".default = true;
+ serde_json = fold recursiveUpdate {} [
+ { "1.0.32".default = (f.serde_json."1.0.32".default or true); }
+ { "1.0.32".indexmap =
+ (f.serde_json."1.0.32".indexmap or false) ||
+ (f.serde_json."1.0.32".preserve_order or false) ||
+ (serde_json."1.0.32"."preserve_order" or false); }
+ ];
+ }) [
+ (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps)
+ (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps)
+ (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps)
+ ];
+
+
+ crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate {
+ crateName = "strsim";
+ version = "0.7.0";
+ authors = [ "Danny Guo " ];
+ sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
+ };
+ features_.strsim."0.7.0" = deps: f: updateFeatures f (rec {
+ strsim."0.7.0".default = (f.strsim."0.7.0".default or true);
+ }) [];
+
+
+ crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate {
+ crateName = "syn";
+ version = "0.15.13";
+ authors = [ "David Tolnay " ];
+ sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh";
+ dependencies = mapFeatures features ([
+ (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps)
+ (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps)
+ ]
+ ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else []));
+ features = mkFeatures (features."syn"."0.15.13" or {});
+ };
+ features_.syn."0.15.13" = deps: f: updateFeatures f (rec {
+ proc_macro2 = fold recursiveUpdate {} [
+ { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
+ { "0.4.20".proc-macro =
+ (f.proc_macro2."0.4.20".proc-macro or false) ||
+ (syn."0.15.13"."proc-macro" or false) ||
+ (f."syn"."0.15.13"."proc-macro" or false); }
+ ];
+ quote = fold recursiveUpdate {} [
+ { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
+ { "0.6.8".proc-macro =
+ (f.quote."0.6.8".proc-macro or false) ||
+ (syn."0.15.13"."proc-macro" or false) ||
+ (f."syn"."0.15.13"."proc-macro" or false); }
+ ];
+ syn = fold recursiveUpdate {} [
+ { "0.15.13".clone-impls =
+ (f.syn."0.15.13".clone-impls or false) ||
+ (f.syn."0.15.13".default or false) ||
+ (syn."0.15.13"."default" or false); }
+ { "0.15.13".default = (f.syn."0.15.13".default or true); }
+ { "0.15.13".derive =
+ (f.syn."0.15.13".derive or false) ||
+ (f.syn."0.15.13".default or false) ||
+ (syn."0.15.13"."default" or false); }
+ { "0.15.13".parsing =
+ (f.syn."0.15.13".parsing or false) ||
+ (f.syn."0.15.13".default or false) ||
+ (syn."0.15.13"."default" or false); }
+ { "0.15.13".printing =
+ (f.syn."0.15.13".printing or false) ||
+ (f.syn."0.15.13".default or false) ||
+ (syn."0.15.13"."default" or false); }
+ { "0.15.13".proc-macro =
+ (f.syn."0.15.13".proc-macro or false) ||
+ (f.syn."0.15.13".default or false) ||
+ (syn."0.15.13"."default" or false); }
+ { "0.15.13".quote =
+ (f.syn."0.15.13".quote or false) ||
+ (f.syn."0.15.13".printing or false) ||
+ (syn."0.15.13"."printing" or false); }
+ ];
+ unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true;
+ }) [
+ (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps)
+ (features_.quote."${deps."syn"."0.15.13"."quote"}" deps)
+ (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps)
+ ];
+
+
+ crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate {
+ crateName = "synstructure";
+ version = "0.10.0";
+ authors = [ "Nika Layzell " ];
+ sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf";
+ dependencies = mapFeatures features ([
+ (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps)
+ (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps)
+ (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps)
+ (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps)
+ ]);
+ features = mkFeatures (features."synstructure"."0.10.0" or {});
+ };
+ features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec {
+ proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true;
+ quote."${deps.synstructure."0.10.0".quote}".default = true;
+ syn = fold recursiveUpdate {} [
+ { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; }
+ { "${deps.synstructure."0.10.0".syn}"."visit" = true; }
+ { "${deps.synstructure."0.10.0".syn}".default = true; }
+ ];
+ synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true);
+ unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true;
+ }) [
+ (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps)
+ (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps)
+ (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps)
+ (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps)
+ ];
+
+
+ crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate {
+ crateName = "tempdir";
+ version = "0.3.7";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
+ dependencies = mapFeatures features ([
+ (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps)
+ (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
+ ]);
+ };
+ features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec {
+ rand."${deps.tempdir."0.3.7".rand}".default = true;
+ remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true;
+ tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true);
+ }) [
+ (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps)
+ (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
+ ];
+
+
+ crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate {
+ crateName = "termcolor";
+ version = "1.0.4";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv";
+ dependencies = (if kernel == "windows" then mapFeatures features ([
+ (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps)
+ ]) else []);
+ };
+ features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec {
+ termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true);
+ wincolor."${deps.termcolor."1.0.4".wincolor}".default = true;
+ }) [
+ (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps)
+ ];
+
+
+ crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate {
+ crateName = "termion";
+ version = "1.5.1";
+ authors = [ "ticki " "gycos " "IGI-111 " ];
+ sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
+ dependencies = (if !(kernel == "redox") then mapFeatures features ([
+ (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps)
+ ]) else [])
+ ++ (if kernel == "redox" then mapFeatures features ([
+ (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps)
+ (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
+ ]) else []);
+ };
+ features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+ libc."${deps.termion."1.5.1".libc}".default = true;
+ redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
+ redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
+ termion."1.5.1".default = (f.termion."1.5.1".default or true);
+ }) [
+ (features_.libc."${deps."termion"."1.5.1"."libc"}" deps)
+ (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps)
+ (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps)
+ ];
+
+
+ crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate {
+ crateName = "textwrap";
+ version = "0.10.0";
+ authors = [ "Martin Geisler " ];
+ sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas";
+ dependencies = mapFeatures features ([
+ (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
+ ]);
+ };
+ features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec {
+ textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true);
+ unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true;
+ }) [
+ (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
+ ];
+
+
+ crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate {
+ crateName = "thread_local";
+ version = "0.3.6";
+ authors = [ "Amanieu d'Antras " ];
+ sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i";
+ dependencies = mapFeatures features ([
+ (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
+ ]);
+ };
+ features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec {
+ lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true;
+ thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true);
+ }) [
+ (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
+ ];
+
+
+ crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate {
+ crateName = "time";
+ version = "0.1.40";
+ authors = [ "The Rust Project Developers" ];
+ sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
+ dependencies = mapFeatures features ([
+ (crates."libc"."${deps."time"."0.1.40"."libc"}" deps)
+ ])
+ ++ (if kernel == "redox" then mapFeatures features ([
+ (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps)
+ ]) else [])
+ ++ (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.time."0.1.40" = deps: f: updateFeatures f (rec {
+ libc."${deps.time."0.1.40".libc}".default = true;
+ redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true;
+ time."0.1.40".default = (f.time."0.1.40".default or true);
+ winapi = fold recursiveUpdate {} [
+ { "${deps.time."0.1.40".winapi}"."minwinbase" = true; }
+ { "${deps.time."0.1.40".winapi}"."minwindef" = true; }
+ { "${deps.time."0.1.40".winapi}"."ntdef" = true; }
+ { "${deps.time."0.1.40".winapi}"."profileapi" = true; }
+ { "${deps.time."0.1.40".winapi}"."std" = true; }
+ { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; }
+ { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; }
+ { "${deps.time."0.1.40".winapi}".default = true; }
+ ];
+ }) [
+ (features_.libc."${deps."time"."0.1.40"."libc"}" deps)
+ (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps)
+ (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps)
+ ];
+
+
+ crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate {
+ crateName = "toml";
+ version = "0.4.8";
+ authors = [ "Alex Crichton " ];
+ sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1";
+ dependencies = mapFeatures features ([
+ (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps)
+ ]);
+ };
+ features_.toml."0.4.8" = deps: f: updateFeatures f (rec {
+ serde."${deps.toml."0.4.8".serde}".default = true;
+ toml."0.4.8".default = (f.toml."0.4.8".default or true);
+ }) [
+ (features_.serde."${deps."toml"."0.4.8"."serde"}" deps)
+ ];
+
+
+ crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate {
+ crateName = "ucd-util";
+ version = "0.1.1";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
+ };
+ features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec {
+ ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true);
+ }) [];
+
+
+ crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
+ crateName = "unicode-width";
+ version = "0.1.5";
+ authors = [ "kwantam " ];
+ sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
+ features = mkFeatures (features."unicode_width"."0.1.5" or {});
+ };
+ features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+ unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
+ }) [];
+
+
+ crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate {
+ crateName = "unicode-xid";
+ version = "0.1.0";
+ authors = [ "erick.tryzelaar " "kwantam " ];
+ sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
+ features = mkFeatures (features."unicode_xid"."0.1.0" or {});
+ };
+ features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec {
+ unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true);
+ }) [];
+
+
+ crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate {
+ crateName = "utf8-ranges";
+ version = "1.0.1";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp";
+ };
+ features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec {
+ utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true);
+ }) [];
+
+
+ crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate {
+ crateName = "vcpkg";
+ version = "0.2.6";
+ authors = [ "Jim McGrath " ];
+ sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
+ };
+ features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
+ vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
+ }) [];
+
+
+ crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate {
+ crateName = "vec_map";
+ version = "0.8.1";
+ 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 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi";
+ dependencies = mapFeatures features ([
+]);
+ features = mkFeatures (features."vec_map"."0.8.1" or {});
+ };
+ features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec {
+ vec_map = fold recursiveUpdate {} [
+ { "0.8.1".default = (f.vec_map."0.8.1".default or true); }
+ { "0.8.1".serde =
+ (f.vec_map."0.8.1".serde or false) ||
+ (f.vec_map."0.8.1".eders or false) ||
+ (vec_map."0.8.1"."eders" or false); }
+ ];
+ }) [];
+
+
+ crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate {
+ crateName = "version_check";
+ version = "0.1.5";
+ authors = [ "Sergio Benitez " ];
+ sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd";
+ };
+ features_.version_check."0.1.5" = deps: f: updateFeatures f (rec {
+ version_check."0.1.5".default = (f.version_check."0.1.5".default or true);
+ }) [];
+
+
+ crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
+ crateName = "winapi";
+ version = "0.3.6";
+ authors = [ "Peter Atashian " ];
+ sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4";
+ build = "build.rs";
+ dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([
+ (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps)
+ ]) else [])
+ ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([
+ (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps)
+ ]) else []);
+ features = mkFeatures (features."winapi"."0.3.6" or {});
+ };
+ features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
+ winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
+ winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
+ }) [
+ (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps)
+ (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps)
+ ];
+
+
+ crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
+ crateName = "winapi-i686-pc-windows-gnu";
+ version = "0.4.0";
+ authors = [ "Peter Atashian " ];
+ sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
+ build = "build.rs";
+ };
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
+ }) [];
+
+
+ crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate {
+ crateName = "winapi-util";
+ version = "0.1.1";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f";
+ dependencies = (if kernel == "windows" then mapFeatures features ([
+ (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps)
+ ]) else []);
+ };
+ features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec {
+ winapi = fold recursiveUpdate {} [
+ { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."std" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; }
+ { "${deps.winapi_util."0.1.1".winapi}".default = true; }
+ ];
+ winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true);
+ }) [
+ (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps)
+ ];
+
+
+ crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
+ crateName = "winapi-x86_64-pc-windows-gnu";
+ version = "0.4.0";
+ authors = [ "Peter Atashian " ];
+ sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
+ build = "build.rs";
+ };
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
+ }) [];
+
+
+ crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate {
+ crateName = "wincolor";
+ version = "1.0.1";
+ authors = [ "Andrew Gallant " ];
+ sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz";
+ dependencies = mapFeatures features ([
+ (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps)
+ (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
+ ]);
+ };
+ features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec {
+ winapi = fold recursiveUpdate {} [
+ { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; }
+ { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; }
+ { "${deps.wincolor."1.0.1".winapi}".default = true; }
+ ];
+ winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true;
+ wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true);
+ }) [
+ (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps)
+ (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
+ ];
+
+
+}
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d93e0a5f56d..da3f0a59eb6 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -6,76 +6,97 @@ let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
in
{
+ cairo-rs = attrs: {
+ buildInputs = [ cairo ];
+ };
+
cargo = attrs: {
buildInputs = [ openssl zlib curl ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
# TODO: buildRustCrate seems to use incorrect default inference
crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ];
};
+
cargo-vendor = attrs: {
buildInputs = [ openssl zlib curl ];
# TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
# be considered a cargo subcommand.
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
};
+
curl-sys = attrs: {
buildInputs = [ pkgconfig zlib curl ];
propagatedBuildInputs = [ curl zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
};
- libgit2-sys = attrs: {
- LIBGIT2_SYS_USE_PKG_CONFIG = true;
- buildInputs = [ pkgconfig openssl zlib libgit2 ];
- };
- libsqlite3-sys = attrs: {
- buildInputs = [ pkgconfig sqlite ];
- };
- libssh2-sys = attrs: {
- buildInputs = [ pkgconfig openssl zlib libssh2 ];
- };
- openssl = attrs: {
- buildInputs = [ openssl ];
- };
- openssl-sys = attrs: {
- buildInputs = [ pkgconfig openssl ];
- };
dbus = attrs: {
buildInputs = [ pkgconfig dbus ];
};
- libdbus-sys = attrs: {
- buildInputs = [ pkgconfig dbus ];
- };
+
gobject-sys = attrs: {
buildInputs = [ dbus-glib ];
};
+
gio-sys = attrs: {
buildInputs = [ dbus-glib ];
};
+
gdk-pixbuf-sys = attrs: {
buildInputs = [ dbus-glib ];
};
+
gdk-pixbuf = attrs: {
buildInputs = [ gdk_pixbuf ];
};
+
+ libgit2-sys = attrs: {
+ LIBGIT2_SYS_USE_PKG_CONFIG = true;
+ buildInputs = [ pkgconfig openssl zlib libgit2 ];
+ };
+
+ libsqlite3-sys = attrs: {
+ buildInputs = [ pkgconfig sqlite ];
+ };
+
+ libssh2-sys = attrs: {
+ buildInputs = [ pkgconfig openssl zlib libssh2 ];
+ };
+
+ libdbus-sys = attrs: {
+ buildInputs = [ pkgconfig dbus ];
+ };
+
+ openssl = attrs: {
+ buildInputs = [ openssl ];
+ };
+
+ openssl-sys = attrs: {
+ buildInputs = [ pkgconfig openssl ];
+ };
+
+ pq-sys = attr: {
+ buildInputs = [ pkgconfig postgresql ];
+ };
+
rink = attrs: {
buildInputs = [ gmp ];
crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ];
};
- cairo-rs = attrs: {
- buildInputs = [ cairo ];
+
+ security-framework-sys = attr: {
+ propagatedBuildInputs = [ Security ];
};
- xcb = attrs: {
- buildInputs = [ python3 ];
+
+ serde_derive = attrs: {
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
};
thrussh-libsodium = attrs: {
buildInputs = [ pkgconfig libsodium ];
};
- pq-sys = attr: {
- buildInputs = [ pkgconfig postgresql ];
- };
- security-framework-sys = attr: {
- propagatedBuildInputs = [ Security ];
+
+ xcb = attrs: {
+ buildInputs = [ python3 ];
};
}
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 7c165627f72..d1ae317ff9a 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -7,7 +7,16 @@ gatherLibraries() {
addEnvHooks "$targetOffset" gatherLibraries
isExecutable() {
- readelf -h "$1" 2> /dev/null | grep -q '^ *Type: *EXEC\>'
+ # For dynamically linked ELF files it would be enough to check just for the
+ # INTERP section. However, we won't catch statically linked executables as
+ # they only have an ELF type of EXEC but no INTERP.
+ #
+ # So what we do here is just check whether *either* the ELF type is EXEC
+ # *or* there is an INTERP section. This also catches position-independent
+ # executables, as they typically have an INTERP section but their ELF type
+ # is DYN.
+ LANG=C readelf -h -l "$1" 2> /dev/null \
+ | grep -q '^ *Type: *EXEC\>\|^ *INTERP\>'
}
# We cache dependencies so that we don't need to search through all of them on
@@ -157,7 +166,7 @@ autoPatchelf() {
isELF "$file" || continue
if isExecutable "$file"; then
# Skip if the executable is statically linked.
- readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
+ LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
fi
autoPatchelfFile "$file"
done < <(find "$prefix" -type f -print0)
diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh
new file mode 100644
index 00000000000..6bef786ac3a
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh
@@ -0,0 +1,9 @@
+breakpointHook() {
+ local red='\033[0;31m'
+ local no_color='\033[0m'
+
+ echo -e "${red}build failed in ${curPhase} with exit code ${exitCode}${no_color}"
+ printf "To attach install cntr and run the following command as root:\n\n"
+ sh -c "echo ' cntr attach -t command cntr-${out}'; while true; do sleep 99999999; done"
+}
+failureHooks+=(breakpointHook)
diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py
index ec3a619027e..f39595f8977 100755
--- a/pkgs/build-support/templaterpm/nix-template-rpm.py
+++ b/pkgs/build-support/templaterpm/nix-template-rpm.py
@@ -44,14 +44,14 @@ class SPECTemplate(object):
self.key = self.getSelfKey()
tmpDir = os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name']))
- if self.translateTable != None:
+ if self.translateTable is not None:
self.relOutputDir = self.translateTable.path(self.key,tmpDir)
else:
self.relOutputDir = tmpDir
self.final_output_dir = os.path.normpath( self.relOutputDir )
- if self.repositoryDir != None:
+ if self.repositoryDir is not None:
self.potential_repository_dir = os.path.normpath( os.path.join(self.repositoryDir,self.relOutputDir) )
@@ -59,7 +59,7 @@ class SPECTemplate(object):
def rewriteCommands(self, string):
string = string.replace('SPACER_DIR_FOR_REMOVAL/','')
string = string.replace('SPACER_DIR_FOR_REMOVAL','')
- string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude == None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude == None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n')))
+ string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude is None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude is None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n')))
string = string.replace('\n','\n ')
string = string.rstrip()
return string
@@ -82,7 +82,7 @@ class SPECTemplate(object):
rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l))))
def filterPackageGroup(target):
- if target == None:
+ if target is None:
return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ]
elif target in self.packageGroups:
return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)]
@@ -90,7 +90,7 @@ class SPECTemplate(object):
raise Exception("Unknown target")
return []
- if target == None:
+ if target is None:
packages = filterPackageGroup(None)
packages.sort()
elif target in self.packageGroups:
@@ -111,7 +111,7 @@ class SPECTemplate(object):
def getBuildInputs(self,target=None):
inputs = self.rewriteInputs(target,self.spec.sourceHeader['requires'])
- if self.translateTable != None:
+ if self.translateTable is not None:
return map(lambda x: self.translateTable.name(x), inputs)
else:
return inputs
@@ -125,7 +125,7 @@ class SPECTemplate(object):
return key
def getSelf(self):
- if self.translateTable != None:
+ if self.translateTable is not None:
return self.translateTable.name(self.key)
else:
return self.key
@@ -161,7 +161,7 @@ class SPECTemplate(object):
facts["sha256"].append(sha256)
patches = [source for (source, _, flag) in self.spec.sources if flag==2]
- if self.buildRootInclude == None:
+ if self.buildRootInclude is None:
facts["patches"] = map(lambda x: './'+x, patches)
else:
facts["patches"] = map(lambda x: '"${buildRoot}/usr/share/buildroot/SOURCES/'+x+'"', reversed(patches))
@@ -292,7 +292,7 @@ class SPECTemplate(object):
if not os.path.exists(self.final_output_dir):
os.makedirs(self.final_output_dir)
- if self.inputDir != None:
+ if self.inputDir is not None:
self.copySources(self.inputDir, self.final_output_dir)
self.copyPatches(self.inputDir, self.final_output_dir)
@@ -334,19 +334,19 @@ class NixTemplate(object):
url = re.match(r'^\s*url\s*=\s*"?(.*?)"?\s*;\s*$', line)
sha256 = re.match(r'^\s*sha256\s*=\s*"(.*?)"\s*;\s*$', line)
patches = re.match(r'^\s*patches\s*=\s*(\[.*?\])\s*;\s*$', line)
- if name != None and self.original["name"] == None:
+ if name is not None and self.original["name"] is None:
self.original["name"] = name.group(1)
self.matchedLines[n] = "name"
- if version != None and self.original["version"] == None:
+ if version is not None and self.original["version"] is None:
self.original["version"] = version.group(1)
self.matchedLines[n] = "version"
- if url != None and self.original["url"] == None:
+ if url is not None and self.original["url"] is None:
self.original["url"] = url.group(1)
self.matchedLines[n] = "url"
- if sha256 != None and self.original["sha256"] == None:
+ if sha256 is not None and self.original["sha256"] is None:
self.original["sha256"] = sha256.group(1)
self.matchedLines[n] = "sha256"
- if patches != None and self.original["patches"] == None:
+ if patches is not None and self.original["patches"] is None:
self.original["patches"] = patches.group(1)
self.matchedLines[n] = "patches"
@@ -355,7 +355,7 @@ class NixTemplate(object):
nixTemplateFile = open(os.path.normpath(self.nixfile),'r')
nixOutFile = open(os.path.normpath(nixOut),'w')
for (n,line) in enumerate(nixTemplateFile):
- if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] != None:
+ if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] is not None:
nixOutFile.write(line.replace(self.original[self.matchedLines[n]], self.update[self.matchedLines[n]], 1))
else:
nixOutFile.write(line)
@@ -383,14 +383,14 @@ class TranslationTable(object):
def update(self, key, path, name=None):
self.tablePath[key] = path
- if name != None:
+ if name is not None:
self.tableName[key] = name
def readTable(self, tableFile):
with file(tableFile, 'r') as infile:
for line in infile:
match = re.match(r'^(.+?)\s+(.+?)\s+(.+?)\s*$', line)
- if match != None:
+ if match is not None:
if not self.tablePath.has_key(match.group(1)):
self.tablePath[match.group(1)] = match.group(2)
if not self.tableName.has_key(match.group(1)):
@@ -449,7 +449,7 @@ if __name__ == "__main__":
nameMap = {}
newTable = TranslationTable()
- if args.translate != None:
+ if args.translate is not None:
table = TranslationTable()
table.readTable(args.translate)
newTable.readTable(args.translate)
@@ -461,7 +461,7 @@ if __name__ == "__main__":
sys.stderr.write("INFO: generate nix file from: %s\n" % specPath)
spec = SPECTemplate(specPath, args.output, args.inputSources, args.buildRoot, table, args.repository, allPackagesDir, args.maintainer)
- if args.repository != None:
+ if args.repository is not None:
if os.path.exists(os.path.join(spec.potential_repository_dir,'default.nix')):
nixTemplate = NixTemplate(os.path.join(spec.potential_repository_dir,'default.nix'))
nixTemplate.loadUpdate(spec.facts)
@@ -470,12 +470,12 @@ if __name__ == "__main__":
nixTemplate.generateUpdated(os.path.join(spec.final_output_dir,'default.nix'))
else:
sys.stderr.write("WARNING: Repository does not contain template: %s\n" % os.path.join(spec.potential_repository_dir,'default.nix'))
- if args.buildRoot == None:
+ if args.buildRoot is None:
spec.generateCombined()
else:
buildRootContent[spec.key] = spec.generateSplit()
else:
- if args.buildRoot == None:
+ if args.buildRoot is None:
spec.generateCombined()
else:
buildRootContent[spec.key] = spec.generateSplit()
@@ -486,7 +486,7 @@ if __name__ == "__main__":
except Exception, e:
sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc()))
- if args.translateOut != None:
+ if args.translateOut is not None:
if not os.path.exists(os.path.dirname(os.path.normpath(args.translateOut))):
os.makedirs(os.path.dirname(os.path.normpath(args.translateOut)))
newTable.writeTable(args.translateOut)
@@ -502,7 +502,7 @@ if __name__ == "__main__":
allPackagesFile.write( '\n\n'.join(map(lambda x: x.callPackage(), map(lambda x: nameMap[x], sortedSpecs))) )
allPackagesFile.close()
- if args.buildRoot != None:
+ if args.buildRoot is not None:
buildRootFilename = os.path.normpath( args.buildRoot )
if not os.path.exists(os.path.dirname(buildRootFilename)):
os.makedirs(os.path.dirname(buildRootFilename))
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix
index 0dd4f727ad2..f7ec6e8b8c8 100644
--- a/pkgs/data/fonts/comfortaa/default.nix
+++ b/pkgs/data/fonts/comfortaa/default.nix
@@ -1,18 +1,18 @@
{stdenv, fetchzip}:
let
- version = "2.004";
+ version = "3.001";
in fetchzip rec {
name = "comfortaa-${version}";
- url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
+ url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip";
postFetch = ''
mkdir -p $out/share/fonts $out/share/doc
unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
'';
- sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h";
+ sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
meta = with stdenv.lib; {
homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 0be58d06fa4..207f3615d1b 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
installPhase = ''
dest=$out/share/fonts/truetype
- mkdir -p $dest
- find . -name "*.ttf" -exec cp -v {} $dest \;
- chmod -x $dest/*.ttf
+ find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index ba214dd35fd..e5a281eebf6 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "1.1.6";
+ version = "1.2.1";
in fetchzip rec {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip rec {
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256 = "0n9qmh6v7gvrl1mfb0knygxlbkb78hvkdrppssx64m3pk4pxw85a";
+ sha256 = "1mwlw39nbqrk08crvgm77l98yyyabwhcgsng89c9s67gq4mlxmxa";
meta = with lib; {
description = "IBM Plex Typeface";
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 40a9be3282e..7fa57463ece 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchzip}:
let
- version = "2014-11-11";
+ version = "2016-06-23";
in fetchzip {
name = "open-dyslexic-${version}";
- url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip;
+ url = https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip;
postFetch = ''
mkdir -p $out/share/{doc,fonts}
@@ -13,7 +13,7 @@ in fetchzip {
unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic
'';
- sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2";
+ sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi";
meta = with stdenv.lib; {
homepage = https://opendyslexic.org/;
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index 8bb4e82747a..c39bb945f48 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "3.0.2";
+ version = "3.0.3";
in fetchzip rec {
name = "overpass-${version}";
@@ -12,7 +12,7 @@ in fetchzip rec {
mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
'';
- sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s";
+ sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
meta = with stdenv.lib; {
homepage = http://overpassfont.org/;
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 079fccadfcb..5fac1606788 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz";
- sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/98ec0eee2ddef5d4a00e2ac4a95e8add46d23b69.tar.gz";
+ sha256 = "0svcaaflqi5c815z3yrh61bjny1jnwp42sylmsnwryjldqvizc1a";
}
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index f0ad2c43a9c..b5293c6d341 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "wireless-regdb-${version}";
- version = "2018.09.07";
+ version = "2018.10.24";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
- sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3";
+ sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd";
};
dontBuild = true;
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index 66d28cbcaf3..610e367b09f 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
go-dbus-generator
];
- makeFlags = [ "GOPATH=$(out)/share/gocode" ];
+ makeFlags = [ "GOPATH=$(out)/share/go" ];
+
+ postPatch = ''
+ sed -i -e 's:/share/gocode:/share/go:' Makefile
+ '';
meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
new file mode 100644
index 00000000000..fe2c5f8f55a
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -0,0 +1,90 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
+ dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
+ deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
+ librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
+ python3Packages, hicolor-icon-theme, go }:
+
+buildGoPackage rec {
+ name = "${pname}-${version}";
+ pname = "dde-daemon";
+ version = "3.2.24.7";
+
+ goPackagePath = "pkg.deepin.io/dde/daemon";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6";
+ };
+
+ patches = [
+ # https://github.com/linuxdeepin/dde-daemon/issues/51
+ (fetchpatch {
+ name = "dde-daemon_3.2.3.patch";
+ url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
+ sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
+ })
+ ];
+
+ goDeps = ./deps.nix;
+
+ outputs = [ "out" ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ dbus-factory
+ go-dbus-factory
+ go-gir-generator
+ go-lib
+ deepin-gettext-tools
+ dde-api
+ linux-pam
+ networkmanager
+ networkmanager.dev
+ python3Packages.python
+ ];
+
+ buildInputs = [
+ alsaLib
+ glib
+ gnome3.libgudev
+ gtk3
+ hicolor-icon-theme
+ libinput
+ libnl
+ librsvg
+ pulseaudio
+ ];
+
+ postPatch = ''
+ patchShebangs .
+
+ sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,'
+
+ sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
+ sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
+ sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
+
+ find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
+ '';
+
+ buildPhase = ''
+ make -C go/src/${goPackagePath}
+ # compilation of the nm module is failing
+ #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
+ '';
+
+ installPhase = ''
+ make install PREFIX="$out" -C go/src/${goPackagePath}
+ remove-references-to -t ${go} $out/lib/deepin-daemon/*
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Daemon for handling Deepin Desktop Environment session settings";
+ homepage = https://github.com/linuxdeepin/dde-daemon;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix
new file mode 100644
index 00000000000..5ffecc28882
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-daemon/deps.nix
@@ -0,0 +1,102 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ 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/axgle/mahonia";
+ fetch = {
+ type = "git";
+ url = "https://github.com/axgle/mahonia";
+ rev = "3358181d7394e26beccfae0ffde05193ef3be33a";
+ sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq";
+ };
+ }
+ {
+ goPackagePath = "github.com/cryptix/wav";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cryptix/wav";
+ rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
+ sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
+ };
+ }
+ {
+ goPackagePath = "github.com/linuxdeepin/go-x11-client";
+ fetch = {
+ type = "git";
+ url = "https://github.com/linuxdeepin/go-x11-client";
+ rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3";
+ sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d";
+ };
+ }
+ {
+ goPackagePath = "github.com/msteinert/pam";
+ fetch = {
+ type = "git";
+ url = "https://github.com/msteinert/pam";
+ rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7";
+ sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync";
+ };
+ }
+ {
+ goPackagePath = "github.com/nfnt/resize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nfnt/resize";
+ rev = "83c6a9932646f83e3267f353373d47347b6036b2";
+ sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/image";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/image";
+ rev = "991ec62608f3c0da01d400756917825d1e2fd528";
+ sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e";
+ sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81";
+ sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+]
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index a36a9677190..c46dea2875a 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
name = "deepin-gtk-theme-${version}";
- version = "17.10.8";
+ version = "17.10.9";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-gtk-theme";
rev = version;
- sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp";
+ sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
makeFlags = [ "PREFIX=$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Deepin GTK Theme";
homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
- license = stdenv.lib.licenses.lgpl3;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.romildo ];
+ license = licenses.lgpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 86e5fc37fa5..a6163cd32e2 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -6,6 +6,7 @@ let
dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
+ dde-daemon = callPackage ./dde-daemon { };
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index a488bd7202c..b9b3aa59a0b 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
};
- makeFlags = [
- "PREFIX=$(out)"
- ];
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ postPatch = ''
+ sed -i -e 's:/share/gocode:/share/go:' Makefile
+ '';
meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 2933c58f8d9..fa38e650c3a 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=$(out)"
- "GOPATH=$(GGOPATH):${go-lib}/share/gocode"
- "HOME=$(TMP)"
+ "GOCACHE=off"
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 44de8889df2..ff9394425e0 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-lib";
- version = "1.2.16.1";
+ version = "1.2.16.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q";
+ sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2";
};
buildInputs = [
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
mobile-broadband-provider-info
];
- makeFlags = [ "PREFIX=$(out)" ];
+ makeFlags = [
+ "PREFIX=$(out)"
+ "GOSITE_DIR=$(out)/share/go"
+ ];
meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index ce596ec628e..1313527e20f 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "adwaita-icon-theme-${version}";
- version = "3.28.0";
+ version = "3.30.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
+ sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index c9312c22882..68193bad583 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
-, libarchive, freetype, libjpeg, libtiff, gnome3
+, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch
}:
let
@@ -13,6 +13,19 @@ in stdenv.mkDerivation rec {
sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-10733-1.patch";
+ url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch;
+ sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd";
+ })
+ (fetchpatch {
+ name = "CVE-2018-10733-2.patch";
+ url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch;
+ sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir";
+ })
+ ];
+
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib cairo freetype libjpeg libtiff ];
propagatedBuildInputs = [ libarchive ];
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index a08e0fd3cd1..34830117b77 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+, pipewire, libgudev, libwacom, xwayland, autoreconfHook, fetchpatch }:
stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
};
+ patches = [
+ # https://gitlab.gnome.org/GNOME/mutter/merge_requests/172
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/mutter/commit/62660bbd.patch;
+ sha256 = "1qq8vxlqnyrqh94dc0dh1aj1dsbyw6bwv3x46q5vsscbbxbiv9wk";
+ })
+ ];
+
configureFlags = [
"--with-x"
"--disable-static"
diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix
index a3e718187c7..3aba235b3a7 100644
--- a/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/pkgs/desktops/gnustep/libobjc2/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ ashalkhakov matthewbauer ];
platforms = platforms.unix;
+ badPlatforms = [ "aarch64-linux" ];
};
}
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index 566245c4441..1659ebaae65 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "python-caja-${version}";
- version = "1.20.0";
+ version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
- sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk";
+ sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 10fa745d978..6f515068418 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -18,11 +18,11 @@ in stdenv.mkDerivation {
srcs = [
(fetchurl {
- url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
+ url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-NO-ARCH.tar.gz";
sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y";
})
(fetchurl {
- url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
+ url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-x86_64.tar.gz";
sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708";
})
];
diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
index 5ee6e338ea4..6bc88ee7661 100644
--- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, libxfce4ui, vte }:
+{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte }:
mkXfceDerivation rec {
category = "apps";
@@ -8,6 +8,7 @@ mkXfceDerivation rec {
sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y";
buildInputs = [ gtk3 libxfce4ui vte ];
+ nativeBuildInputs = [ wrapGAppsHook ];
meta = {
description = "A modern terminal emulator";
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index de058530999..5489adc5399 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -1,17 +1,57 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, lib, buildPythonApplication, fetchFromGitHub
, bottle, click, colorama
, lockfile, pyserial, requests
-, semantic-version
+, pytest, semantic-version, tox
, git
}:
-buildPythonPackage rec {
- pname = "platformio";
- version = "3.5.3";
+let
+ args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
+ "commands/test_ci.py::test_ci_boards"
+ "commands/test_ci.py::test_ci_project_conf"
+ "commands/test_ci.py::test_ci_lib_and_board"
+ "commands/test_init.py::test_init_enable_auto_uploading"
+ "commands/test_init.py::test_init_custom_framework"
+ "commands/test_init.py::test_init_incorrect_board"
+ "commands/test_init.py::test_init_ide_atom"
+ "commands/test_init.py::test_init_ide_eclipse"
+ "commands/test_init.py::test_init_duplicated_boards"
+ "commands/test_init.py::test_init_special_board"
+ "commands/test_lib.py::test_search"
+ "commands/test_lib.py::test_install_duplicates"
+ "commands/test_lib.py::test_global_lib_update_check"
+ "commands/test_lib.py::test_global_lib_update"
+ "commands/test_lib.py::test_global_lib_uninstall"
+ "commands/test_lib.py::test_lib_show"
+ "commands/test_lib.py::test_lib_stats"
+ "commands/test_lib.py::test_global_install_registry"
+ "commands/test_lib.py::test_global_install_archive"
+ "commands/test_lib.py::test_global_install_repository"
+ "commands/test_lib.py::test_global_lib_list"
+ "commands/test_test.py::test_local_env"
+ "test_builder.py::test_build_flags"
+ "test_builder.py::test_build_unflags"
+ "test_misc.py::test_api_cache"
+ "test_misc.py::test_ping_internet_ips"
+ "test_pkgmanifest.py::test_packages"
+ ]) ++ (map (e: "--ignore=tests/${e}") [
+ "commands/test_boards.py"
+ "commands/test_platform.py"
+ "commands/test_update.py"
+ "test_maintenance.py"
+ "test_ino2cpp.py"
+ ]));
- src = fetchPypi {
- inherit pname version;
- sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011";
+in buildPythonApplication rec {
+ pname = "platformio";
+ version = "3.6.1";
+
+ # pypi tarball doesn't contain tests
+ src = fetchFromGitHub {
+ owner = "platformio";
+ repo = "platformio-core";
+ rev = "v${version}";
+ sha256 = "01xz9figqrzb0m9467q14lg51vmgq0hbaap0xdx08n5v2ycmzj0v";
};
propagatedBuildInputs = [
@@ -19,12 +59,25 @@ buildPythonPackage rec {
pyserial requests semantic-version
];
+ HOME = "/tmp";
+
+ checkInputs = [ pytest tox ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ py.test -v tests ${args}
+
+ runHook postCheck
+ '';
+
patches = [ ./fix-searchpath.patch ];
meta = with stdenv.lib; {
+ broken = stdenv.isAarch64;
description = "An open source ecosystem for IoT development";
homepage = http://platformio.org;
- maintainers = with maintainers; [ mog makefu ];
license = licenses.asl20;
+ maintainers = with maintainers; [ mog makefu ];
};
}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
new file mode 100644
index 00000000000..c2c13649f88
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -0,0 +1,59 @@
+{ name
+, url
+, sha256
+}:
+
+{ swingSupport ? true # not used for now
+, stdenv
+, fetchurl
+}:
+
+let result = stdenv.mkDerivation rec {
+ inherit name;
+
+ src = fetchurl {
+ inherit url sha256;
+ };
+
+ # See: https://github.com/NixOS/patchelf/issues/10
+ dontStrip = 1;
+
+ installPhase = ''
+ cd ..
+
+ mv $sourceRoot $out
+
+ rm -rf $out/Home/demo
+
+ # Remove some broken manpages.
+ rm -rf $out/Home/man/ja*
+
+ # for backward compatibility
+ ln -s $out/Contents/Home $out/jre
+
+ ln -s $out/Contents/Home/* $out/
+
+ mkdir -p $out/nix-support
+
+ # Set JAVA_HOME automatically.
+ cat <> $out/nix-support/setup-hook
+ if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ EOF
+ '';
+
+ # FIXME: use multiple outputs or return actual JRE package
+ passthru.jre = result;
+
+ passthru.home = result;
+
+ # for backward compatibility
+ passthru.architecture = "";
+
+ meta = with stdenv.lib; {
+ license = licenses.gpl2Classpath;
+ description = "AdoptOpenJDK, prebuilt OpenJDK binary";
+ platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
+ maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ };
+
+}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
new file mode 100644
index 00000000000..cf38ca9eaeb
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -0,0 +1,119 @@
+{ name
+, url
+, sha256
+}:
+
+{ swingSupport ? true
+, stdenv
+, fetchurl
+, file
+, xorg ? null
+, glib
+, libxml2
+, ffmpeg_2
+, libxslt
+, libGL
+, freetype
+, fontconfig
+, gtk2
+, pango
+, cairo
+, alsaLib
+, atk
+, gdk_pixbuf
+, zlib
+, elfutils
+}:
+
+assert swingSupport -> xorg != null;
+
+let
+ rSubPaths = [
+ "lib/jli"
+ "lib/server"
+ "lib/compressedrefs" # OpenJ9
+ "lib/j9vm" # OpenJ9
+ "lib"
+ ];
+
+ libraries = [
+ stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
+ xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf
+ atk zlib elfutils
+ ] ++ (stdenv.lib.optionals swingSupport [
+ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
+ xorg.libXrender
+ stdenv.cc.cc
+ ]);
+in
+
+let result = stdenv.mkDerivation rec {
+ inherit name;
+
+ src = fetchurl {
+ inherit url sha256;
+ };
+
+ nativeBuildInputs = [ file ];
+
+ # See: https://github.com/NixOS/patchelf/issues/10
+ dontStrip = 1;
+
+ installPhase = ''
+ cd ..
+
+ # Set PaX markings
+ exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+ for file in $exes; do
+ paxmark m "$file"
+ # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+ ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+ done
+
+ mv $sourceRoot $out
+
+ rm -rf $out/demo
+
+ # Remove some broken manpages.
+ rm -rf $out/man/ja*
+
+ # for backward compatibility
+ ln -s $out $out/jre
+
+ mkdir -p $out/nix-support
+
+ # Set JAVA_HOME automatically.
+ cat <> $out/nix-support/setup-hook
+ if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ EOF
+ '';
+
+ postFixup = ''
+ rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
+
+ # set all the dynamic linkers
+ find $out -type f -perm -0100 \
+ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "$rpath" {} \;
+
+ find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+ '';
+
+ rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
+ # FIXME: use multiple outputs or return actual JRE package
+ passthru.jre = result;
+
+ passthru.home = result;
+
+ # for backward compatibility
+ passthru.architecture = "";
+
+ meta = with stdenv.lib; {
+ license = licenses.gpl2Classpath;
+ description = "AdoptOpenJDK, prebuilt OpenJDK binary";
+ platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+ maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ };
+
+}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
new file mode 100644
index 00000000000..77d9d85aaa9
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -0,0 +1,26 @@
+let
+ version = "11";
+ buildNumber = "28";
+ baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
+ makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
+ name = if packageType == "jdk"
+ then
+ "adoptopenjdk-${vmType}-bin-${version}"
+ else
+ "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+ url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
+ inherit sha256;
+ };
+in
+{
+ jdk-hotspot = makePackage {
+ packageType = "jdk";
+ vmType = "hotspot";
+ sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
+ };
+ jre-hotspot = makePackage {
+ packageType = "jre";
+ vmType = "hotspot";
+ sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
+ };
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
new file mode 100644
index 00000000000..6e00782c391
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -0,0 +1,36 @@
+let
+ version = "11";
+ buildNumber = "28";
+ baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
+ makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
+ name = if packageType == "jdk"
+ then
+ "adoptopenjdk-${vmType}-bin-${version}"
+ else
+ "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+ url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
+ inherit sha256;
+ };
+in
+{
+ jdk-hotspot = makePackage {
+ packageType = "jdk";
+ vmType = "hotspot";
+ sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
+ };
+ jre-hotspot = makePackage {
+ packageType = "jre";
+ vmType = "hotspot";
+ sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
+ };
+ jdk-openj9 = makePackage {
+ packageType = "jdk";
+ vmType = "openj9";
+ sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f";
+ };
+ jre-openj9 = makePackage {
+ packageType = "jre";
+ vmType = "openj9";
+ sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42";
+ };
+}
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index d6453d1d107..6da21d7f400 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
, withContrib ? true }:
let
- versionPkg = "0.3.11" ;
+ versionPkg = "0.3.12" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
- sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc";
+ sha256 = "6e53e3070f50600373b857a73a76196adffcabc3c0d3173eaaf9a5f50f4596f4";
};
postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
- sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a";
+ sha256 = "63eb02b225a11752745e8f08691140ed764288ab4ceda3710670cde24835b0d8";
};
buildInputs = [ gmp ];
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 63b31c60d98..d26f731c21f 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20180805";
+ version = "20180910";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
+ sha256 = "12k4cp9f8g03k3zf2g70pn6ybx8gk0hfh81ypiyb5hkfij95bi9k";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0648a245a4c..51cea9810bc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
, gmp, openssl, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }:
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
let
binaryVersion = "0.26.0";
@@ -57,7 +57,7 @@ let
buildInputs = [
boehmgc libatomic_ops pcre libevent
- llvm
+ llvm zlib openssl
] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv
];
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index e44c21abe94..7a062a55215 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -149,8 +149,7 @@ let
};
};
-in {
-
+in rec {
cudatoolkit_6 = common {
version = "6.0.37";
url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
@@ -199,8 +198,8 @@ in {
gcc = gcc6;
};
- cudatoolkit_9 = common {
- version = "9.1.85.1";
+ cudatoolkit_9_1 = common {
+ version = "9.1.85.3";
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
runPatches = [
@@ -208,9 +207,40 @@ in {
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux";
sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g";
})
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux";
+ sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym";
+ })
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux";
+ sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422";
+ })
];
gcc = gcc6;
};
-}
+ cudatoolkit_9_2 = common {
+ version = "9.2.148.1";
+ url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux";
+ sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm";
+ runPatches = [
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux";
+ sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw";
+ })
+ ];
+ gcc = gcc6;
+ };
+ cudatoolkit_9 = cudatoolkit_9_2;
+
+ cudatoolkit_10_0 = common {
+ version = "10.0.130";
+ url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
+ sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj";
+
+ gcc = gcc6;
+ };
+
+ cudatoolkit_10 = cudatoolkit_10_0;
+}
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index eb7a1e73719..9970fd9b33d 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,14 +12,14 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
- version = "2.1.402";
- netCoreVersion = "2.1.4";
+ version = "2.1.403";
+ netCoreVersion = "2.1.5";
name = "dotnet-sdk-${version}";
src = fetchurl {
url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
# use sha512 from the download page
- sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48";
+ sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9";
};
unpackPhase = ''
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
deleted file mode 100644
index 945649b2978..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, ncurses5, python27 }:
-
-stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
- version = "6-2017-q2-update";
- subdir = "6-2017q2";
-
- platformString =
- if stdenv.isLinux then "linux"
- else if stdenv.isDarwin then "mac"
- else throw "unsupported platform";
-
- urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2";
-
- src =
- if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
- else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
- else throw "unsupported platform";
-
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
- installPhase = ''
- mkdir -p $out
- cp -r * $out
- '';
-
- dontPatchELF = true;
- dontStrip = true;
-
- preFixup = ''
- find $out -type f | while read f; do
- patchelf $f > /dev/null 2>&1 || continue
- patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
- patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
- done
- '';
-
- meta = {
- description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
- homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
- license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
- maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
- };
-}
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
deleted file mode 100644
index c22683dae03..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, lib, fetchurl, ncurses5, python27 }:
-
-with lib;
-
-stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
- version = "7-2018-q2-update";
- subdir = "7-2018q2";
-
- urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2";
-
- src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; };
-
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
- installPhase = ''
- mkdir -p $out
- cp -r * $out
- '';
-
- dontPatchELF = true;
- dontStrip = true;
-
- preFixup = ''
- find $out -type f | while read f; do
- patchelf $f > /dev/null 2>&1 || continue
- patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
- patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
- done
- '';
-
- meta = {
- description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
- homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
- license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
- maintainers = with maintainers; [ prusnak ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
deleted file mode 100644
index 039b5a9ce36..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses
-, dirName ? null, subdirName ? null }:
-with stdenv.lib;
-let
- versionParts = splitString "-" version; # 4.7 2013q3 20130916
- majorVersion = elemAt versionParts 0; # 4.7
- yearQuarter = elemAt versionParts 1; # 2013q3
- underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916
- yearQuarterParts = splitString "q" yearQuarter; # 2013 3
- year = elemAt yearQuarterParts 0; # 2013
- quarter = elemAt yearQuarterParts 1; # 3
- dirName_ = if dirName != null then dirName else majorVersion;
- subdirName_ = if subdirName != null then subdirName
- else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
-in
-stdenv.mkDerivation {
- name = "gcc-arm-embedded-${version}";
-
- src = fetchurl {
- url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
- sha256 = sha256;
- };
-
- nativeBuildInputs = [ bzip2 patchelf ];
-
- dontPatchELF = true;
-
- phases = "unpackPhase patchPhase installPhase";
-
- installPhase = ''
- mkdir -pv $out
- cp -r ./* $out
-
- for f in $(find $out); do
- if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
- patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
- --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \
- "$f" || true
- fi
- done
- '';
-
- meta = with stdenv.lib; {
- description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)";
- homepage = https://launchpad.net/gcc-arm-embedded;
- license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
- maintainers = [ maintainers.rasendubi ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index d9376f597a7..e585f296e87 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -130,7 +130,7 @@ let version = "4.8.5";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -148,10 +148,15 @@ let version = "4.8.5";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -270,7 +275,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -360,20 +365,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${libcCross.dev}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru = {
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c60f54f1560..9dae061ecbb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -135,7 +135,7 @@ let version = "4.9.4";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -156,10 +156,15 @@ let version = "4.9.4";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -292,7 +297,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -381,20 +386,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 47c849d2dcc..fbc192752c7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -122,7 +122,7 @@ let version = "5.5.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -143,10 +143,15 @@ let version = "5.5.0";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -296,7 +301,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -387,20 +392,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index eeb57be9715..793752dee19 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -120,7 +120,7 @@ let version = "6.4.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -143,10 +143,15 @@ let version = "6.4.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -301,7 +306,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -391,20 +396,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 59897ccff42..c75a6c6e68f 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -67,7 +67,7 @@ let version = "7.3.0";
[ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
"--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
(if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
+ "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}"
"--with-gcc"
"--with-gnu-as"
"--with-gnu-ld"
@@ -92,7 +92,7 @@ let version = "7.3.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -115,11 +115,17 @@ let version = "7.3.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ # No final libdecnumber (it may work only in 386)
+ "--disable-decimal-float"
+ ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -188,7 +194,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
- else "");
+ else "")
+ + stdenv.lib.optionalString targetPlatform.isAvr ''
+ makeFlagsArray+=(
+ 'LIMITS_H_TEST=false'
+ )
+ '';
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
@@ -267,7 +278,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -334,20 +345,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 7842110a214..bcac577712a 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -87,7 +87,7 @@ let version = "8.2.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -110,10 +110,15 @@ let version = "8.2.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -261,7 +266,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -322,23 +327,16 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}/include"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
- ]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 0de6be36c35..a308abd9c16 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -104,10 +104,15 @@ let version = "7-20170409";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -290,20 +295,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
deleted file mode 100644
index b69ae80d0db..00000000000
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ /dev/null
@@ -1,194 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, coreutils, fetchurl, perl
-, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? true
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-}:
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = stdenv.lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- docFixes = fetchurl {
- url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
- sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0";
- };
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- '' + stdenv.lib.optionalString enableIntegerSimple ''
- INTEGER_LIBRARY = integer-simple
- '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = YES
- HADDOCK_DOCS = NO
- '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: [ ncurses ]
- ++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
-
- toolsForTarget =
- if hostPlatform == buildPlatform then
- [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
- else assert targetPlatform == hostPlatform; # build != host == target
- [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation rec {
- version = "7.10.3";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [
- docFixes
- ./relocation.patch
- ];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
- "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
- ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
- # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatability.
- strictDeps = true;
-
- nativeBuildInputs = [
- perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
- ghc bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = libDeps hostPlatform;
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- hardeningDisable = [ "format" ];
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-7.10.3";
- };
-
- meta = {
- homepage = http://haskell.org/ghc;
- description = "The Glasgow Haskell Compiler";
- maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
- inherit (ghc.meta) license platforms;
- };
-
-}
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
deleted file mode 100644
index f7422d150ac..00000000000
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ /dev/null
@@ -1,201 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, coreutils, fetchpatch, fetchurl, perl, sphinx
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? true
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = stdenv.lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = YES
- HADDOCK_DOCS = NO
- '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: [ ncurses ]
- ++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
-
- toolsForTarget =
- if hostPlatform == buildPlatform then
- [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
- else assert targetPlatform == hostPlatform; # build != host == target
- [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation rec {
- version = "8.0.2";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "man" "doc" ];
-
- patches = [
- ./ghc-gold-linker.patch
- (fetchpatch { # Unreleased 1.24.x commit
- url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch";
- sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0";
- stripLen = 1;
- extraPrefix = "libraries/Cabal/";
- })
- ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
- ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
- ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
- ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
- # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatability.
- strictDeps = true;
-
- nativeBuildInputs = [
- perl sphinx
- ghc bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = libDeps hostPlatform;
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- hardeningDisable = [ "format" ];
-
- postInstall = ''
- for bin in "$out"/lib/${name}/bin/*; do
- isELF "$bin" || continue
- paxmark m "$bin"
- done
-
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-8.0.2";
- };
-
- meta = {
- homepage = http://haskell.org/ghc;
- description = "The Glasgow Haskell Compiler";
- maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
- inherit (ghc.meta) license platforms;
- };
-
-}
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 6caeaf20f64..626c0d8ca9c 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
+ patchShebangs ghc-${version}/configure
'' +
# Strip is harmful, see also below. It's important that this happens
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
deleted file mode 100644
index e43f9a57d0a..00000000000
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whetherto build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-, # Whether to backport https://phabricator.haskell.org/D4388 for
- # deterministic profiling symbol names, at the cost of a slightly
- # non-standard GHC API
- deterministicProfiling ? false
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = stdenv.lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
- ++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget =
- if hostPlatform == buildPlatform then
- [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
- else assert targetPlatform == hostPlatform; # build != host == target
- [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.4.3";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [(fetchpatch {
- url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
- sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
- extraPrefix = "utils/hsc2hs/";
- stripLen = 1;
- }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
- url = "http://tarballs.nixos.org/sha256/${sha256}";
- name = "D5123.diff";
- sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
- })] ++ stdenv.lib.optional deterministicProfiling
- (fetchpatch rec {
- url = "http://tarballs.nixos.org/sha256/${sha256}";
- name = "D4388.diff";
- sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
- })
- ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + stdenv.lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
- ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
- # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatability.
- strictDeps = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = libDeps hostPlatform;
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ];
-
- postInstall = ''
- for bin in "$out"/lib/${name}/bin/*; do
- isELF "$bin" || continue
- paxmark m "$bin"
- done
-
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-8.4.3";
- };
-
- meta = {
- homepage = http://haskell.org/ghc;
- description = "The Glasgow Haskell Compiler";
- maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
- inherit (ghc.meta) license platforms;
- };
-
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
- dontStrip = true;
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 62ea39791b9..2363953e35b 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -215,7 +215,7 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.4.3";
+ haskellCompilerName = "ghc-8.6.1";
};
meta = {
diff --git a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
deleted file mode 100644
index 90224df19f6..00000000000
--- a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- b/includes/rts/storage/ClosureMacros.h 2017-05-21 12:54:09.000000000 +0200
-+++ a/includes/rts/storage/ClosureMacros.h 2017-05-21 12:55:57.000000000 +0200
-@@ -499,8 +499,17 @@
-
- -------------------------------------------------------------------------- */
-
--#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING))
--#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
-+#if defined(PROFILING)
-+#define ZERO_SLOP_FOR_LDV_PROF 1
-+#else
-+#define ZERO_SLOP_FOR_LDV_PROF 0
-+#endif
-+
-+#if defined(DEBUG) && !defined(THREADED_RTS)
-+#define ZERO_SLOP_FOR_SANITY_CHECK 1
-+#else
-+#define ZERO_SLOP_FOR_SANITY_CHECK 0
-+#endif
-
- #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
- #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
-
diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
deleted file mode 100644
index edce7ef3a17..00000000000
--- a/pkgs/development/compilers/ghc/ghc-gold-linker.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
-Date: Fri, 21 Jul 2017 20:09:11 +0200
-Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm
- functions.
-
-Linking with gold needs this because in contrast to ld, gold
-doesn't implicitly link libm.
-
-Found by Michael Bishop .
----
- libraries/base/base.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
-index f00fb8768e5..fd91f268ffe 100644
---- a/libraries/base/base.cabal
-+++ b/libraries/base/base.cabal
-@@ -342,6 +342,10 @@ Library
- WCsubst.h
- consUtils.h
-
-+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+ -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+ extra-libraries: m
-+
- -- OS Specific
- if os(windows)
- -- Windows requires some extra libraries for linking because the RTS
-
-From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001
-From: michael bishop
-Date: Sat, 22 Jul 2017 13:12:39 -0300
-Subject: [PATCH 2/2] also add -lm to ghc-prim
-
----
- libraries/ghc-prim/ghc-prim.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
-index 00a029efedf..6db85dd69fc 100644
---- a/libraries/ghc-prim/ghc-prim.cabal
-+++ b/libraries/ghc-prim/ghc-prim.cabal
-@@ -42,6 +42,10 @@ Library
- UnliftedFFITypes
-
- build-depends: rts == 1.0.*
-+
-+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+ -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+ extra-libraries: m
-
- exposed-modules:
- GHC.CString
diff --git a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
deleted file mode 100644
index 8fea9f92012..00000000000
--- a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
-index 99620ee..e052a84 100644
---- a/rts/posix/OSMem.c
-+++ b/rts/posix/OSMem.c
-@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size)
- sysErrorBelch("unable to make released memory unaccessible");
- #endif
-
--#ifdef MADV_FREE
-- // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
-- // just swaps memory out
-- r = madvise(at, size, MADV_FREE);
--#else
- r = madvise(at, size, MADV_DONTNEED);
--#endif
- if(r < 0)
- sysErrorBelch("unable to decommit memory");
- }
diff --git a/pkgs/development/compilers/ghc/relocation.patch b/pkgs/development/compilers/ghc/relocation.patch
deleted file mode 100644
index b9becfc86b5..00000000000
--- a/pkgs/development/compilers/ghc/relocation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Adding support for the R_X86_64_REX_GOTPCRELX relocation type.
-This relocation is treated by the linker the same as the R_X86_64_GOTPCRELX type
-G + GOT + A - P to generate relative offsets to the GOT.
-The REX prefix has no influence in this stage.
-
-This caused breakage when enabling relro/bindnow hardening e.g. in ghcPaclages.vector
-
-Source: https://phabricator.haskell.org/D2303#67070
-diff --git a/rts/Linker.c b/rts/Linker.c
---- a/rts/Linker.c
-+++ b/rts/Linker.c
-@@ -5681,7 +5681,13 @@
- *(Elf64_Sword *)P = (Elf64_Sword)value;
- #endif
- break;
--
-+/* These two relocations were introduced in glibc 2.23 and binutils 2.26.
-+ But in order to use them the system which compiles the bindist for GHC needs
-+ to have glibc >= 2.23. So only use them if they're defined. */
-+#if defined(R_X86_64_REX_GOTPCRELX) && defined(R_X86_64_GOTPCRELX)
-+ case R_X86_64_REX_GOTPCRELX:
-+ case R_X86_64_GOTPCRELX:
-+#endif
- case R_X86_64_GOTPCREL:
- {
- StgInt64 gotAddress = (StgInt64) &makeSymbolExtra(oc, ELF_R_SYM(info), S)->addr;
-
diff --git a/pkgs/development/compilers/ghcjs/7.10/boot.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch
deleted file mode 100644
index 9f4fa3a8b7a..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
- msg info "creating package databases"
- initDB "--global" <^> beLocations . blGlobalDB
-- traverseOf_ _Just initUser <^> beLocations . blUserDBDir
- where
-- initUser dir = rm_f (dir "package.conf") >> initDB "--user" (dir "package.conf.d")
- initDB dbName db = do
- rm_rf db >> mkdir_p db
- ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
- msgD info $ "preparing development boot tree"
- checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
- testGit "ghcjs-boot" >>= \case
-- Just False -> failWith "ghcjs-boot already exists and is not a git repository"
-- Just True -> do
-- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "ghcjs-boot"
-+ Just _ -> do
-+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
- initGhcjsBoot
- Nothing -> do
- msgD info "cloning ghcjs-boot git repository"
- initGhcjsBoot
- checkpoint' "shims-git" "shims repository already cloned" $ do
- testGit "shims" >>= \case
-- Just False -> failWith "shims already exists and is not a git repository"
-- Just True -> do
-- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "shims"
-- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+ Just _ -> do
-+ msgD info "shims repository already exists; moving on"
- Nothing -> do
- msgD info "cloning shims git repository"
- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
- where
- initGhcjsBoot = sub $ do
-- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev
- cd "ghcjs-boot"
-- git_ ["submodule", "update", "--init", "--recursive"]
- mapM_ patchPackage =<< allPackages
- preparePrimops
- buildGenPrim
-@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
- globalFlags <- cabalGlobalFlags
- flags <- cabalInstallFlags (length pkgs == 1)
- let args = globalFlags ++ ("install" : pkgs) ++
-- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
-+ [ "--allow-boot-library-installs"
- ] ++ map ("--configure-option="<>) configureOpts ++ flags
- checkInstallPlan pkgs args
- cabal_ args
-@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
- -- uses somewhat fragile parsing of --dry-run output, find a better way
- checkInstallPlan :: [Package] -> [Text] -> B ()
- checkInstallPlan pkgs opts = do
-- plan <- cabal (opts ++ ["-v2", "--dry-run"])
-+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
- when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
- where
- hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
- , "--avoid-reinstalls"
- , "--builddir", "dist"
- , "--with-compiler", ghcjs ^. pgmLocText
-+ , "--with-gcc", "@CC@"
- , "--with-hc-pkg", ghcjsPkg ^. pgmLocText
-- , "--prefix", toTextI instDir
-+ , "--prefix", "@PREFIX@"
-+ , "--libdir", "$prefix/lib/$compiler"
-+ , "--libsubdir", "$pkgid"
- , bool haddock "--enable-documentation" "--disable-documentation"
- , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
- , "--haddock-hoogle"
--#endif
- , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
-- appdir <- getAppUserDataDirectory "ghcjs"
-- return (appdir subdir "ghcjs")
-- where
-- targetARCH = arch
-- targetOS = os
-- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix
deleted file mode 100644
index f18a094aa3c..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
- version = "0.2.0";
-
- inherit bootPkgs cabal-install;
-
- ghcjsSrc = fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs";
- rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
- sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
- };
- ghcjsBootSrc = fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "8c549931da27ba9e607f77195208ec156c840c8a";
- sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
- fetchSubmodules = true;
- };
-
- shims = import ./shims.nix { inherit fetchFromGitHub; };
- stage1Packages = [
- "array"
- "base"
- "binary"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-boot"
- "ghc-boot-th"
- "ghc-prim"
- "ghci"
- "ghcjs-prim"
- "ghcjs-th"
- "integer-gmp"
- "pretty"
- "primitive"
- "process"
- "rts"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
- stage2 = import ./stage2.nix;
-
- patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix
deleted file mode 100644
index fa706699449..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "ghcjs";
- repo = "shims";
- rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca";
- sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz";
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix
deleted file mode 100644
index 3483afc99ef..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/stage2.nix
+++ /dev/null
@@ -1,344 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
- async = callPackage
- ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.0.1.6";
- src = "${ghcjsBoot}/boot/async";
- doCheck = false;
- libraryHaskellDepends = [ base stm ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- ];
- jailbreak = true;
- homepage = https://github.com/simonmar/async;
- description = "Run IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- aeson = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
- , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
- , stdenv, syb, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "0.9.0.1";
- src = "${ghcjsBoot}/boot/aeson";
- doCheck = false;
- libraryHaskellDepends = [
- attoparsec base bytestring containers deepseq dlist ghc-prim
- hashable mtl scientific syb template-haskell text time transformers
- unordered-containers vector
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers ghc-prim HUnit QuickCheck
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 text time unordered-containers vector
- ];
- jailbreak = true;
- homepage = https://github.com/bos/aeson;
- description = "Fast JSON parsing and encoding";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- attoparsec = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , QuickCheck, quickcheck-unicode, scientific, stdenv
- , test-framework, test-framework-quickcheck2, text, transformers
- , vector
- }:
- mkDerivation {
- pname = "attoparsec";
- version = "0.13.0.1";
- src = "${ghcjsBoot}/boot/attoparsec";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring containers deepseq scientific text
- transformers
- ];
- testHaskellDepends = [
- array base bytestring containers deepseq QuickCheck
- quickcheck-unicode scientific test-framework
- test-framework-quickcheck2 text transformers vector
- ];
- jailbreak = true;
- homepage = https://github.com/bos/attoparsec;
- description = "Fast combinator parsing for bytestrings and text";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- case-insensitive = callPackage
- ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
- , test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "case-insensitive";
- version = "1.2.0.4";
- src = "${ghcjsBoot}/boot/case-insensitive";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq hashable text ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit text
- ];
- jailbreak = true;
- homepage = https://github.com/basvandijk/case-insensitive;
- description = "Case insensitive string comparison";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- dlist = callPackage
- ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
- mkDerivation {
- pname = "dlist";
- version = "0.7.1.1";
- src = "${ghcjsBoot}/boot/dlist";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- jailbreak = true;
- homepage = https://github.com/spl/dlist;
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- extensible-exceptions = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "extensible-exceptions";
- version = "0.1.1.4";
- src = "${ghcjsBoot}/boot/extensible-exceptions";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- description = "Extensible exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- hashable = callPackage
- ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
- , QuickCheck, random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.2.3.2";
- src = "${ghcjsBoot}/boot/hashable";
- doCheck = false;
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- jailbreak = true;
- homepage = https://github.com/tibbe/hashable;
- description = "A class for types that can be converted to a hash value";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- mtl = callPackage
- ({ mkDerivation, base, stdenv, transformers }:
- mkDerivation {
- pname = "mtl";
- version = "2.2.1";
- src = "${ghcjsBoot}/boot/mtl";
- doCheck = false;
- libraryHaskellDepends = [ base transformers ];
- jailbreak = true;
- homepage = https://github.com/ekmett/mtl;
- description = "Monad classes, using functional dependencies";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- old-time = callPackage
- ({ mkDerivation, base, old-locale, stdenv }:
- mkDerivation {
- pname = "old-time";
- version = "1.1.0.3";
- src = "${ghcjsBoot}/boot/old-time";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale ];
- jailbreak = true;
- description = "Time library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- parallel = callPackage
- ({ mkDerivation, array, base, containers, deepseq, stdenv }:
- mkDerivation {
- pname = "parallel";
- version = "3.2.0.6";
- src = "${ghcjsBoot}/boot/parallel";
- doCheck = false;
- libraryHaskellDepends = [ array base containers deepseq ];
- jailbreak = true;
- description = "Parallel programming library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- scientific = callPackage
- ({ mkDerivation, array, base, bytestring, deepseq, ghc-prim
- , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
- , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
- , text
- }:
- mkDerivation {
- pname = "scientific";
- version = "0.3.3.8";
- src = "${ghcjsBoot}/boot/scientific";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring deepseq ghc-prim hashable integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring QuickCheck smallcheck tasty tasty-ant-xml
- tasty-hunit tasty-quickcheck tasty-smallcheck text
- ];
- jailbreak = true;
- homepage = https://github.com/basvandijk/scientific;
- description = "Numbers represented using scientific notation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- stm = callPackage
- ({ mkDerivation, array, base, stdenv }:
- mkDerivation {
- pname = "stm";
- version = "2.4.4";
- src = "${ghcjsBoot}/boot/stm";
- doCheck = false;
- libraryHaskellDepends = [ array base ];
- jailbreak = true;
- description = "Software Transactional Memory";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- syb = callPackage
- ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
- mkDerivation {
- pname = "syb";
- version = "0.5.1";
- src = "${ghcjsBoot}/boot/syb";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base containers HUnit mtl ];
- jailbreak = true;
- homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB;
- description = "Scrap Your Boilerplate";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- text = callPackage
- ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
- , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
- , random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "text";
- version = "1.2.1.1";
- src = "${ghcjsBoot}/boot/text";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring deepseq ghc-prim integer-gmp
- ];
- testHaskellDepends = [
- array base binary bytestring deepseq directory ghc-prim HUnit
- integer-gmp QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = https://github.com/bos/text;
- description = "An efficient packed Unicode text type";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- unordered-containers = callPackage
- ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
- , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.5.1";
- src = "${ghcjsBoot}/boot/unordered-containers";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = https://github.com/tibbe/unordered-containers;
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- vector = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
- , random, stdenv, template-haskell, test-framework
- , test-framework-quickcheck2, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.11.0.0";
- src = "${ghcjsBoot}/boot/vector";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base QuickCheck random template-haskell test-framework
- test-framework-quickcheck2 transformers
- ];
- jailbreak = true;
- homepage = https://github.com/haskell/vector;
- description = "Efficient Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- ghcjs-base = callPackage
- ({ mkDerivation, aeson, array, attoparsec, base, bytestring
- , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
- , hashable, HUnit, integer-gmp, primitive, QuickCheck
- , quickcheck-unicode, random, scientific, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "ghcjs-base";
- version = "0.2.0.0";
- src = "${ghcjsBoot}/ghcjs/ghcjs-base";
- doCheck = false;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring containers deepseq dlist ghc-prim
- ghcjs-prim hashable integer-gmp primitive scientific text time
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
- primitive QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = https://github.com/ghcjs/ghcjs-base;
- description = "Base library for GHCJS";
- license = stdenv.lib.licenses.mit;
- }) {};
- Cabal = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, extensible-exceptions, filepath, HUnit
- , old-time, pretty, process, QuickCheck, regex-posix, stdenv
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , time, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.22.8.0";
- src = "${ghcjsBoot}/boot/cabal/Cabal";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- pretty process time unix
- ];
- testHaskellDepends = [
- base bytestring containers directory extensible-exceptions filepath
- HUnit old-time process QuickCheck regex-posix test-framework
- test-framework-hunit test-framework-quickcheck2 unix
- ];
- jailbreak = true;
- homepage = http://www.haskell.org/cabal/;
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/boot.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch
deleted file mode 100644
index bbb5b30468c..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/boot.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
- msg info "creating package databases"
- initDB "--global" <^> beLocations . blGlobalDB
-- traverseOf_ _Just initUser <^> beLocations . blUserDBDir
- where
-- initUser dir = rm_f (dir "package.conf") >> initDB "--user" (dir "package.conf.d")
- initDB dbName db = do
- rm_rf db >> mkdir_p db
- ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
- msgD info $ "preparing development boot tree"
- checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
- testGit "ghcjs-boot" >>= \case
-- Just False -> failWith "ghcjs-boot already exists and is not a git repository"
-- Just True -> do
-- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "ghcjs-boot"
-+ Just _ -> do
-+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
- initGhcjsBoot
- Nothing -> do
- msgD info "cloning ghcjs-boot git repository"
- initGhcjsBoot
- checkpoint' "shims-git" "shims repository already cloned" $ do
- testGit "shims" >>= \case
-- Just False -> failWith "shims already exists and is not a git repository"
-- Just True -> do
-- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "shims"
-- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+ Just _ -> do
-+ msgD info "shims repository already exists; moving on"
- Nothing -> do
- msgD info "cloning shims git repository"
- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
- where
- initGhcjsBoot = sub $ do
-- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev
- cd "ghcjs-boot"
-- git_ ["submodule", "update", "--init", "--recursive"]
- mapM_ patchPackage =<< allPackages
- preparePrimops
- buildGenPrim
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
- , "--avoid-reinstalls"
- , "--builddir", "dist"
- , "--with-compiler", ghcjs ^. pgmLocText
-+ , "--with-gcc", "@CC@"
- , "--with-hc-pkg", ghcjsPkg ^. pgmLocText
-- , "--prefix", toTextI instDir
-+ , "--prefix", "@PREFIX@"
-+ , "--libdir", "$prefix/lib/$compiler"
-+ , "--libsubdir", "$pkgid"
- , bool haddock "--enable-documentation" "--disable-documentation"
- , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
- , "--haddock-hoogle"
--#endif
- , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
-- appdir <- getAppUserDataDirectory "ghcjs"
-- return (appdir subdir "ghcjs")
-- where
-- targetARCH = arch
-- targetOS = os
-- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/8.0/default.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix
deleted file mode 100644
index a786f536eb9..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
- version = "0.2.020170323";
-
- inherit bootPkgs cabal-install;
-
- ghcjsSrc = fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs";
- rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6";
- sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw";
- };
- ghcjsBootSrc = fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "106e144cca6529a1b9612c11aea5d6ef65b96745";
- sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l";
- fetchSubmodules = true;
- };
-
- shims = import ./shims.nix { inherit fetchFromGitHub; };
- stage1Packages = [
- "array"
- "base"
- "binary"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-boot"
- "ghc-boot-th"
- "ghc-prim"
- "ghci"
- "ghcjs-prim"
- "ghcjs-th"
- "integer-gmp"
- "pretty"
- "primitive"
- "process"
- "rts"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
- stage2 = import ./stage2.nix;
-
- patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix
deleted file mode 100644
index a9a7f8d45e2..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "ghcjs";
- repo = "shims";
- rev = "85395dce971e23a39e5f93af4ed139ca36d4e448";
- sha256 = "1kqgik75jx681s1kjx1s7dryigr3m940c3zb9vy0r3psxrw6sf2g";
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix
deleted file mode 100644
index 18c7a76dd3a..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/stage2.nix
+++ /dev/null
@@ -1,545 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
- async = callPackage
- ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.1.1";
- src = "${ghcjsBoot}/boot/async";
- doCheck = false;
- libraryHaskellDepends = [ base stm ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- ];
- jailbreak = true;
- homepage = "https://github.com/simonmar/async";
- description = "Run IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- aeson = callPackage
- ({ mkDerivation, attoparsec, base, base-compat, base-orphans
- , base16-bytestring, bytestring, containers, deepseq, directory
- , dlist, filepath, generic-deriving, ghc-prim, hashable
- , hashable-time, HUnit, integer-logarithms, QuickCheck
- , quickcheck-instances, scientific, stdenv, tagged
- , template-haskell, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, th-abstraction, time
- , time-locale-compat, unordered-containers, uuid-types, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "1.2.2.0";
- src = "${ghcjsBoot}/boot/aeson";
- doCheck = false;
- libraryHaskellDepends = [
- attoparsec base base-compat bytestring containers deepseq dlist
- ghc-prim hashable scientific tagged template-haskell text
- th-abstraction time time-locale-compat unordered-containers
- uuid-types vector
- ];
- testHaskellDepends = [
- attoparsec base base-compat base-orphans base16-bytestring
- bytestring containers directory dlist filepath generic-deriving
- ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
- quickcheck-instances scientific tagged template-haskell
- test-framework test-framework-hunit test-framework-quickcheck2 text
- time time-locale-compat unordered-containers uuid-types vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/aeson";
- description = "Fast JSON parsing and encoding";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- attoparsec = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive
- , containers, criterion, deepseq, directory, filepath, ghc-prim
- , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
- , stdenv, tasty, tasty-quickcheck, text, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "attoparsec";
- version = "0.13.1.0";
- src = "${ghcjsBoot}/boot/attoparsec";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring containers deepseq scientific text
- transformers
- ];
- testHaskellDepends = [
- array base bytestring deepseq QuickCheck quickcheck-unicode
- scientific tasty tasty-quickcheck text transformers vector
- ];
- benchmarkHaskellDepends = [
- array base bytestring case-insensitive containers criterion deepseq
- directory filepath ghc-prim http-types parsec scientific text
- transformers unordered-containers vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/attoparsec";
- description = "Fast combinator parsing for bytestrings and text";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- base-compat = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }:
- mkDerivation {
- pname = "base-compat";
- version = "0.9.3";
- src = "${ghcjsBoot}/boot/base-compat";
- doCheck = false;
- libraryHaskellDepends = [ base unix ];
- testHaskellDepends = [ base hspec QuickCheck ];
- jailbreak = true;
- description = "A compatibility layer for base";
- license = stdenv.lib.licenses.mit;
- }) {};
- bytestring-builder = callPackage
- ({ mkDerivation, base, bytestring, deepseq, stdenv }:
- mkDerivation {
- pname = "bytestring-builder";
- version = "0.10.8.1.0";
- src = "${ghcjsBoot}/boot/bytestring-builder";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq ];
- jailbreak = true;
- description = "The new bytestring builder, packaged outside of GHC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- case-insensitive = callPackage
- ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
- , HUnit, stdenv, test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "case-insensitive";
- version = "1.2.0.8";
- src = "${ghcjsBoot}/boot/case-insensitive";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq hashable text ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit text
- ];
- benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/case-insensitive";
- description = "Case insensitive string comparison";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- dlist = callPackage
- ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
- mkDerivation {
- pname = "dlist";
- version = "0.8.0.2";
- src = "${ghcjsBoot}/boot/dlist";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- jailbreak = true;
- homepage = "https://github.com/spl/dlist";
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- extensible-exceptions = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "extensible-exceptions";
- version = "0.1.1.4";
- src = "${ghcjsBoot}/boot/extensible-exceptions";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- description = "Extensible exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- fail = callPackage
- ({ mkDerivation, stdenv }:
- mkDerivation {
- pname = "fail";
- version = "4.9.0.0";
- src = "${ghcjsBoot}/boot/fail";
- jailbreak = true;
- homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
- description = "Forward-compatible MonadFail class";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- hashable = callPackage
- ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
- , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.2.4.0";
- src = "${ghcjsBoot}/boot/hashable";
- doCheck = false;
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion ghc-prim integer-gmp siphash text
- ];
- jailbreak = true;
- homepage = "http://github.com/tibbe/hashable";
- description = "A class for types that can be converted to a hash value";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- integer-logarithms = callPackage
- ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
- , smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
- , tasty-smallcheck
- }:
- mkDerivation {
- pname = "integer-logarithms";
- version = "1.0.2";
- src = "${ghcjsBoot}/boot/integer-logarithms";
- doCheck = false;
- libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
- testHaskellDepends = [
- base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
- tasty-smallcheck
- ];
- jailbreak = true;
- homepage = "https://github.com/phadej/integer-logarithms";
- description = "Integer logarithms";
- license = stdenv.lib.licenses.mit;
- }) {};
- mtl = callPackage
- ({ mkDerivation, base, stdenv, transformers }:
- mkDerivation {
- pname = "mtl";
- version = "2.2.1";
- src = "${ghcjsBoot}/boot/mtl";
- doCheck = false;
- libraryHaskellDepends = [ base transformers ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/mtl";
- description = "Monad classes, using functional dependencies";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- nats = callPackage
- ({ mkDerivation, stdenv }:
- mkDerivation {
- pname = "nats";
- version = "1.1.1";
- src = "${ghcjsBoot}/boot/nats";
- jailbreak = true;
- homepage = "http://github.com/ekmett/nats/";
- description = "Natural numbers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- old-time = callPackage
- ({ mkDerivation, base, old-locale, stdenv }:
- mkDerivation {
- pname = "old-time";
- version = "1.1.0.3";
- src = "${ghcjsBoot}/boot/old-time";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale ];
- jailbreak = true;
- description = "Time library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- parallel = callPackage
- ({ mkDerivation, array, base, containers, deepseq, stdenv }:
- mkDerivation {
- pname = "parallel";
- version = "3.2.1.0";
- src = "${ghcjsBoot}/boot/parallel";
- doCheck = false;
- libraryHaskellDepends = [ array base containers deepseq ];
- jailbreak = true;
- description = "Parallel programming library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- random = callPackage
- ({ mkDerivation, base, stdenv, time }:
- mkDerivation {
- pname = "random";
- version = "1.1";
- src = "${ghcjsBoot}/boot/random";
- doCheck = false;
- libraryHaskellDepends = [ base time ];
- testHaskellDepends = [ base ];
- jailbreak = true;
- description = "random number library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- scientific = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
- , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit
- , tasty-quickcheck, tasty-smallcheck, text, vector
- }:
- mkDerivation {
- pname = "scientific";
- version = "0.3.4.10";
- src = "${ghcjsBoot}/boot/scientific";
- doCheck = false;
- libraryHaskellDepends = [
- base binary bytestring containers deepseq ghc-prim hashable
- integer-gmp integer-logarithms text vector
- ];
- testHaskellDepends = [
- base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
- tasty-hunit tasty-quickcheck tasty-smallcheck text
- ];
- benchmarkHaskellDepends = [ base criterion ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/scientific";
- description = "Numbers represented using scientific notation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- semigroups = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "semigroups";
- version = "0.18.3";
- src = "${ghcjsBoot}/boot/semigroups";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/semigroups/";
- description = "Anything that associates";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- stm = callPackage
- ({ mkDerivation, array, base, stdenv }:
- mkDerivation {
- pname = "stm";
- version = "2.4.4.1";
- src = "${ghcjsBoot}/boot/stm";
- doCheck = false;
- libraryHaskellDepends = [ array base ];
- jailbreak = true;
- description = "Software Transactional Memory";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- syb = callPackage
- ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
- mkDerivation {
- pname = "syb";
- version = "0.6";
- src = "${ghcjsBoot}/boot/syb";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base containers HUnit mtl ];
- jailbreak = true;
- homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
- description = "Scrap Your Boilerplate";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- tagged = callPackage
- ({ mkDerivation, base, deepseq, stdenv, template-haskell
- , transformers, transformers-compat
- }:
- mkDerivation {
- pname = "tagged";
- version = "0.8.5";
- src = "${ghcjsBoot}/boot/tagged";
- doCheck = false;
- libraryHaskellDepends = [
- base deepseq template-haskell transformers transformers-compat
- ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/tagged";
- description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- text = callPackage
- ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
- , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
- , random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "text";
- version = "1.2.2.1";
- src = "${ghcjsBoot}/boot/text";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring deepseq ghc-prim integer-gmp
- ];
- testHaskellDepends = [
- array base binary bytestring deepseq directory ghc-prim HUnit
- integer-gmp QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/text";
- description = "An efficient packed Unicode text type";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- th-abstraction = callPackage
- ({ mkDerivation, base, containers, ghc-prim, stdenv
- , template-haskell
- }:
- mkDerivation {
- pname = "th-abstraction";
- version = "0.2.6.0";
- src = "${ghcjsBoot}/boot/th-abstraction";
- doCheck = false;
- libraryHaskellDepends = [
- base containers ghc-prim template-haskell
- ];
- testHaskellDepends = [ base containers template-haskell ];
- jailbreak = true;
- homepage = "https://github.com/glguy/th-abstraction";
- description = "Nicer interface for reified information about data types";
- license = stdenv.lib.licenses.isc;
- }) {};
- time-locale-compat = callPackage
- ({ mkDerivation, base, old-locale, stdenv, time }:
- mkDerivation {
- pname = "time-locale-compat";
- version = "0.1.1.3";
- src = "${ghcjsBoot}/boot/time-locale-compat";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale time ];
- jailbreak = true;
- homepage = "https://github.com/khibino/haskell-time-locale-compat";
- description = "Compatibility of TimeLocale between old-locale and time-1.5";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- transformers-compat = callPackage
- ({ mkDerivation, base, ghc-prim, stdenv, transformers }:
- mkDerivation {
- pname = "transformers-compat";
- version = "0.5.1.4";
- src = "${ghcjsBoot}/boot/transformers-compat";
- doCheck = false;
- libraryHaskellDepends = [ base ghc-prim transformers ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/transformers-compat/";
- description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- unordered-containers = callPackage
- ({ mkDerivation, base, bytestring, ChasingBottoms, containers
- , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
- , mtl, QuickCheck, random, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.7.2";
- src = "${ghcjsBoot}/boot/unordered-containers";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq deepseq-generics
- hashable hashmap mtl random
- ];
- jailbreak = true;
- homepage = "https://github.com/tibbe/unordered-containers";
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- uuid-types = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
- , tasty-hunit, tasty-quickcheck, text, unordered-containers
- }:
- mkDerivation {
- pname = "uuid-types";
- version = "1.0.3";
- src = "${ghcjsBoot}/boot/uuid/uuid-types";
- doCheck = false;
- libraryHaskellDepends = [
- base binary bytestring deepseq hashable random text
- ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq random
- unordered-containers
- ];
- jailbreak = true;
- homepage = "https://github.com/hvr/uuid";
- description = "Type definitions for Universally Unique Identifiers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- vector = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
- , random, stdenv, template-haskell, test-framework
- , test-framework-quickcheck2, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.11.0.0";
- src = "${ghcjsBoot}/boot/vector";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base QuickCheck random template-haskell test-framework
- test-framework-quickcheck2 transformers
- ];
- jailbreak = true;
- homepage = "https://github.com/haskell/vector";
- description = "Efficient Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- ghcjs-base = callPackage
- ({ mkDerivation, aeson, array, attoparsec, base, bytestring
- , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
- , hashable, HUnit, integer-gmp, primitive, QuickCheck
- , quickcheck-unicode, random, scientific, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "ghcjs-base";
- version = "0.2.0.0";
- src = "${ghcjsBoot}/ghcjs/ghcjs-base";
- doCheck = false;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring containers deepseq dlist ghc-prim
- ghcjs-prim hashable integer-gmp primitive scientific text time
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
- primitive QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = "http://github.com/ghcjs/ghcjs-base";
- description = "base library for GHCJS";
- license = stdenv.lib.licenses.mit;
- }) {};
- Cabal = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, exceptions, filepath, old-time, pretty
- , process, QuickCheck, regex-posix, stdenv, tagged, tasty
- , tasty-hunit, tasty-quickcheck, time, transformers, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.24.0.0";
- src = "${ghcjsBoot}/boot/cabal/Cabal";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- pretty process time unix
- ];
- testHaskellDepends = [
- base bytestring containers directory exceptions filepath old-time
- pretty process QuickCheck regex-posix tagged tasty tasty-hunit
- tasty-quickcheck transformers unix
- ];
- jailbreak = true;
- homepage = "http://www.haskell.org/cabal/";
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-}
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 7721ce06a56..a35143b4349 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -50,6 +50,9 @@ let
rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; }
+ rec { sha1 = "a828a4f32caf9ac0b74f2548f87310959558c526"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612.tar.gz; }
+ rec { sha1 = "7ac829f0c9a37f5cc39afd2265588a365480720d"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612-linux-amd64.tar.gz; }
+ rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; }
];
findbugs = fetchzip {
@@ -61,13 +64,13 @@ let
in rec {
mx = stdenv.mkDerivation rec {
- version = "5.176.4";
+ version = "5.192.0";
name = "mx";
src = fetchFromGitHub {
owner = "graalvm";
repo = "mx";
rev = version;
- sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw";
+ sha256 = "04gdf1gzlc8a6li8lcnrs2j9zicj11fs1vqqf7cmhb4pm2h72hml";
};
nativeBuildInputs = [ makeWrapper ];
buildPhase = ''
@@ -79,6 +82,11 @@ in rec {
'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
return True'
+
+ # avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
+ substituteInPlace mx.py --replace \
+ 'zipfile.ZipInfo(arcname, time.localtime(os.path.getmtime(join(root, f)))[:6])' \
+ 'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])'
'';
installPhase = ''
mkdir -p $out/bin
@@ -97,9 +105,9 @@ in rec {
# copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
jvmci8 = stdenv.mkDerivation rec {
- version = "0.45";
+ version = "0.49";
name = let
- n = "jvmci8u171-${version}";
+ n = "jvmci${/*"8u191"*/ lib.removePrefix "oraclejdk-" oraclejdk8.name}-${version}";
in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
n
else
@@ -108,7 +116,7 @@ in rec {
owner = "graalvm";
repo = "graal-jvmci-8";
rev = "jvmci-${version}";
- sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12";
+ sha256 = "1zgin0w1qa7wmfhcisx470fhnmddfxxp5nyyix31yaa7dznql82k";
};
buildInputs = [ mx mercurial ];
postUnpack = ''
@@ -146,7 +154,7 @@ in rec {
};
graalvm8 = stdenv.mkDerivation rec {
- version = "1.0.0-rc3";
+ version = "1.0.0-rc8";
name = let
n = "graal-${version}";
in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
@@ -157,7 +165,7 @@ in rec {
owner = "oracle";
repo = "graal";
rev = "vm-${version}";
- sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3";
+ sha256 = "1fada4awrr8bhw294xdiq4bagvgrlcr44mw6338gaal0ky3vkm0p";
};
buildInputs = [ mx zlib mercurial jvmci8 ];
postUnpack = ''
@@ -170,6 +178,17 @@ in rec {
hg checkout ${lib.escapeShellArg src.rev}
)
'';
+ postPatch = ''
+ substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
+ --replace '' '<${zlib.dev}/include/zlib.h>'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+ --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
+ --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
+ 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+ --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
+ '';
buildPhase = ''
# make a copy of jvmci8
cp -dpR ${jvmci8} $out
@@ -178,13 +197,14 @@ in rec {
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
export MX_CACHE_DIR=${makeMxCache graal-mxcache}
+
( cd substratevm
mkdir -p clibraries
mx --java-home $out build
# bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4)
- mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage
+ mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/jdk1.8/svm-driver.jar com.oracle.svm.driver.NativeImage
)
( cd tools
mx --java-home $out build
@@ -195,17 +215,17 @@ in rec {
mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include}
cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar $out/jre/lib/graal/
+ cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-*processor*.jar $out/jre/lib/graal/
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar $out/jre/lib/jvmci/
+ cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-management.jar $out/jre/lib/jvmci/
cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/
- cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/
+ cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/* $out/jre/lib/truffle/
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/
cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/
cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/
cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/
cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar $out/jre/tools/truffle/builder/
+ cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/truffle-nfi.jar $out/jre/tools/truffle/builder/
echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties
echo -n "graal" > $out/jre/lib/jvmci/compiler-name
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
deleted file mode 100644
index 4f09df7f2ea..00000000000
--- a/pkgs/development/compilers/mentor/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics
-
-{ stdenv, fetchurl, patchelf, ncurses }:
-
-let
-
- buildToolchain =
- { name, src, description }:
-
- stdenv.mkDerivation rec {
- inherit name src;
-
- nativeBuildInputs = [ patchelf ];
-
- buildCommand = ''
- # Unpack tarball
- mkdir -p "$out"
- tar --strip-components=1 -xjf "$src" -C "$out"
-
- # Patch binaries
- interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
- for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
- # Skip non-executable files
- case "$file" in
- *README.txt) echo "skipping $file"; continue;;
- *liblto_plugin.so*) echo "skipping $file"; continue;;
- esac
-
- # Skip directories
- test -d "$file" && continue
-
- echo "patchelf'ing $file"
- patchelf --set-interpreter "$interpreter" "$file"
-
- # GDB needs ncurses
- case "$file" in
- *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";;
- esac
- done
-
- # Manpages
- mkdir -p "$out/share/man"
- ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
- ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
- '';
-
- meta = with stdenv.lib; {
- inherit description;
- homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
- };
- };
-
-in
-
-{
-
- armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec {
- name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}";
- description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics";
- src = fetchurl {
- url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2";
- sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr";
- };
- };
-
- armEabi = let version = "2013.05-23"; in buildToolchain rec {
- name = "sourcery-codebench-lite-arm-eabi-${version}";
- description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics";
- src = fetchurl {
- url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2";
- sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923";
- };
- };
-
- # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH,
- # ColdFire (and more).
-}
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index cfee1b0d863..f15a7624327 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, avrdude, avrbinutils, avrgcc, avrlibc, makeWrapper }:
+{ stdenv, fetchzip, vim, makeWrapper }:
stdenv.mkDerivation rec {
name = "microscheme-${version}";
@@ -10,15 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
};
- # Just a guess
- propagatedBuildInputs = [ avrlibc ];
buildInputs = [ makeWrapper vim ];
installPhase = ''
make install PREFIX=$out
-
- wrapProgram $out/bin/microscheme \
- --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcc avrbinutils ]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix
deleted file mode 100644
index 892ae99abaf..00000000000
--- a/pkgs/development/compilers/mono/4.0.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
- inherit Foundation libobjc;
- version = "4.0.4.1";
- sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd";
- meta = {
- knownVulnerabilities = [ "CVE-2009-0689" ];
- };
-})
diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix
deleted file mode 100644
index 9a3ccd1fd86..00000000000
--- a/pkgs/development/compilers/mono/4.4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic.nix (rec {
- inherit Foundation libobjc;
- version = "4.4.2.11";
- sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
- enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
-})
diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 2bba660b69c..5ccdadc2878 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -5,4 +5,5 @@ callPackage ./generic.nix (rec {
version = "4.6.2.16";
sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
+ meta.knownVulnerabilities = [ "CVE-2018-1002208" ];
})
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index 9665f5006ed..12f833f5525 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -86,7 +86,5 @@ stdenv.mkDerivation rec {
platforms = with platforms; darwin ++ linux;
maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
license = licenses.free; # Combination of LGPL/X11/GPL ?
- # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06
- broken = stdenv.isAarch64 && (versionAtLeast version "5");
};
}
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index a4b706d35aa..ae36041b33e 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,14 +1,14 @@
# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
stdenv.mkDerivation rec {
name = "nim-${version}";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchurl {
url = "https://nim-lang.org/download/${name}.tar.xz";
- sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
+ sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1";
};
doCheck = !stdenv.isDarwin;
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
"-lcrypto"
"-lpcre"
"-lreadline"
- "-lsqlite3"
"-lgc"
];
@@ -28,12 +27,21 @@ stdenv.mkDerivation rec {
# used for bootstrapping, but koch insists on moving the nim compiler around
# as part of building it, so it cannot be read-only
- buildInputs = [
- makeWrapper nodejs-slim-8_x tzdata coreutils
- openssl pcre readline sqlite boehmgc sfml
+ nativeBuildInputs = [
+ makeWrapper nodejs-slim-10_x tzdata coreutils
];
+ buildInputs = [
+ openssl pcre readline boehmgc sfml
+ ];
+
+ phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];
+
buildPhase = ''
+ # use $CC to trigger the linker since calling ld in build.sh causes an error
+ LD=$CC
+ # build.sh wants to write to $HOME/.cache
+ HOME=$TMPDIR
sh build.sh
./bin/nim c koch
./koch boot -d:release \
@@ -51,33 +59,24 @@ stdenv.mkDerivation rec {
--suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
'';
- postPatch =
+ patchPhase =
let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' '';
+ disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
disableCompile = ''sed -i -e 's/^/#/' '';
in ''
substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- # disable supposedly broken tests
- ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim
- ${disableTest} ./tests/vm/trgba.nim
-
# disable tests requiring network access (not available in the build container)
${disableTest} ./tests/stdlib/thttpclient.nim
- ${disableTest} ./tests/cpp/tasync_cpp.nim
- ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
-
- # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase)
- ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim
- ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim
- ${disableCompile} ./tests/manyloc/nake/nakefile.nim
- ${disableTest} ./tests/manyloc/nake/nakefile.nim
- ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim
- ${disableTest} ./tests/manyloc/named_argument_bug/main.nim
+ '' + lib.optionalString stdenv.isAarch64 ''
+ # disable test supposedly broken on aarch64
+ ${disableStdLibTest} ./lib/pure/stats.nim
'';
checkPhase = ''
+ PATH=$PATH:$out/bin
./koch tests
'';
diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix
index 19b9626f4e8..c1952f30ba6 100644
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@@ -1,8 +1,8 @@
import ./generic.nix {
major_version = "4";
minor_version = "07";
- patch_version = "0";
- sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl";
+ patch_version = "1";
+ sha256 = "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z";
# If the executable is stripped it does not work
dontStrip = true;
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/11.nix
similarity index 67%
rename from pkgs/development/compilers/openjdk/10.nix
rename to pkgs/development/compilers/openjdk/11.nix
index 1c125fac62f..e2d89f3ef72 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
@@ -10,31 +10,30 @@
let
/**
- * The JRE libraries are in directories that depend on the CPU.
+ * The JDK libraries are in directories that depend on the CPU.
*/
architecture =
if stdenv.hostPlatform.system == "i686-linux" then
"i386"
else "amd64";
- update = "10.0.2";
+ major = "11";
+ update = ".0.1";
build = "13";
- repover = "jdk-${update}+${build}";
+ repover = "jdk-${major}${update}+${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
- openjdk10 = stdenv.mkDerivation {
- name = "openjdk-${update}-b${build}";
+ openjdk = stdenv.mkDerivation {
+ name = "openjdk-${major}${update}-b${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
- sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
+ url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+ sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm";
};
- outputs = [ "out" "jre" ];
-
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+ autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr lndir fontconfig
] ++ lib.optionals (!minimal && enableGnome2) [
@@ -55,12 +54,11 @@ let
configureFlagsArray=(
"--with-boot-jdk=${bootjdk.home}"
- "--with-update-version=${update}"
+ "--with-update-version=${major}${update}"
"--with-build-number=${build}"
"--with-milestone=fcs"
"--enable-unlimited-crypto"
"--disable-debug-symbols"
- "--disable-freetype-bundling"
"--with-zlib=system"
"--with-giflib=system"
"--with-stdc++lib=dynamic"
@@ -86,7 +84,7 @@ let
buildFlags = [ "all" ];
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+ mkdir -p $out/lib/openjdk $out/share
cp -av build/*/images/jdk/* $out/lib/openjdk
@@ -101,57 +99,29 @@ let
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
- # Copy the JRE to a separate output and setup fallback fonts
- cp -av build/*/images/jre $jre/lib/openjdk/
- mkdir $out/lib/openjdk/jre
- ${lib.optionalString (!minimal) ''
- mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
- lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
- ''}
-
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
${lib.optionalString minimal ''
- for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
- rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so
- done
+ rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
- lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
-
# Set PaX markings
- exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+ exes=$(file $out/lib/openjdk/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
echo "to mark: *$exes*"
for file in $exes; do
echo "marking *$file*"
paxmark ${paxflags} "$file"
done
- # Remove duplicate binaries.
- for i in $(cd $out/lib/openjdk/bin && echo *); do
- if [ "$i" = java ]; then continue; fi
- if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
- ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
- fi
- done
-
ln -s $out/lib/openjdk/bin $out/bin
- ln -s $jre/lib/openjdk/jre/bin $jre/bin
- ln -s $jre/lib/openjdk/jre $out/jre
'';
- # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
- prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
- patchELF $jre
- propagatedBuildInputs+=" $jre"
-
- # Propagate the setJavaClassPath setup hook from the JRE so that
- # any package that depends on the JRE has $CLASSPATH set up
- # properly.
- mkdir -p $jre/nix-support
+ # Propagate the setJavaClassPath setup hook so that any package
+ # that depends on the JDK has $CLASSPATH set up properly.
+ mkdir -p $out/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
- echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
+ echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
@@ -196,7 +166,7 @@ let
passthru = {
inherit architecture;
- home = "${openjdk10}/lib/openjdk";
+ home = "${openjdk}/lib/openjdk";
};
};
-in openjdk10
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 612f0db0582..1b20ca6cc60 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -16,12 +16,12 @@ let
src = if stdenv.hostPlatform.system == "x86_64-linux" then
(if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
- else throw "No bootstrap for version")
+ else throw "No bootstrap jdk for version ${version}")
else if stdenv.hostPlatform.system == "i686-linux" then
(if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
else throw "No bootstrap for version")
- else throw "No bootstrap for system";
+ else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}";
bootstrap = runCommand "openjdk-bootstrap" {
passthru.home = "${bootstrap}/lib/openjdk";
diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
similarity index 79%
rename from pkgs/development/compilers/openjdk/darwin/10.nix
rename to pkgs/development/compilers/openjdk/darwin/11.nix
index 4969c12bff2..61c2d57423e 100644
--- a/pkgs/development/compilers/openjdk/darwin/10.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -6,13 +6,13 @@ let
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
- jdk = stdenv.mkDerivation {
- name = "zulu10.3+5-jdk10";
+ jdk = stdenv.mkDerivation rec {
+ name = "zulu11.2.3-jdk11.0.1";
src = fetchurl {
- url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
- sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
- curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
+ url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
+ sha256 = "1jxnxmy79inwf3146ygry1mzv3dj6yrzqll16j7dpr91x1p3dpqy";
+ curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
};
buildInputs = [ unzip freetype ];
@@ -34,8 +34,8 @@ let
'';
preFixup = ''
- # Propagate the setJavaClassPath setup hook from the JRE so that
- # any package that depends on the JRE has $CLASSPATH set up
+ # Propagate the setJavaClassPath setup hook from the JDK so that
+ # any package that depends on the JDK has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@@ -49,7 +49,6 @@ let
'';
passthru = {
- jre = jdk;
home = jdk;
};
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
deleted file mode 100644
index 23f44331dd8..00000000000
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ swingSupport ? true
-, stdenv
-, requireFile
-, makeWrapper
-, file
-, xorg ? null
-, packageType ? "JDK" # JDK, JRE, or ServerJRE
-, glib
-, libxml2
-, ffmpeg_2
-, libxslt
-, libGL
-, freetype
-, fontconfig
-, gtk2
-, pango
-, cairo
-, alsaLib
-, atk
-, gdk_pixbuf
-, zlib
-, elfutils
-, setJavaClassPath
-}:
-
-assert swingSupport -> xorg != null;
-
-let
- version = "10.0.2";
-
- downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
-
- rSubPaths = [
- "lib/jli"
- "lib/server"
- "lib"
- ];
-
-in
-
-let result = stdenv.mkDerivation rec {
- name = if packageType == "JDK" then "oraclejdk-${version}"
- else if packageType == "JRE" then "oraclejre-${version}"
- else if packageType == "ServerJRE" then "oracleserverjre-${version}"
- else abort "unknown package Type ${packageType}";
-
- src =
- if packageType == "JDK" then
- requireFile {
- name = "jdk-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/jdk10-downloads-4416644.html";
- sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6";
- }
- else if packageType == "JRE" then
- requireFile {
- name = "jre-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/jre10-downloads-4417026.html";
- sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx";
- }
- else if packageType == "ServerJRE" then
- requireFile {
- name = "serverjre-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
- sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c";
- }
- else abort "unknown package Type ${packageType}";
-
- nativeBuildInputs = [ file ];
-
- buildInputs = [ makeWrapper ];
-
- # See: https://github.com/NixOS/patchelf/issues/10
- dontStrip = 1;
-
- installPhase = ''
- cd ..
-
- # Set PaX markings
- exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
- for file in $exes; do
- paxmark m "$file"
- # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
- ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
- done
-
- mv $sourceRoot $out
-
- shopt -s extglob
- for file in $out/*
- do
- if test -f $file ; then
- rm $file
- fi
- done
-
- if test -z "$pluginSupport"; then
- rm -f $out/bin/javaws
- fi
-
- mkdir $out/lib/plugins
- ln -s $out/lib/libnpjp2.so $out/lib/plugins
-
- # for backward compatibility
- ln -s $out $out/jre
-
- mkdir -p $out/nix-support
- printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
- # Set JAVA_HOME automatically.
- cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
- EOF
- '';
-
- postFixup = ''
- rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
- # Oracle Java Mission Control needs to know where libgtk-x11 and related is
- if test -x $out/bin/jmc; then
- wrapProgram "$out/bin/jmc" \
- --suffix-each LD_LIBRARY_PATH ':' "$rpath"
- fi
- '';
-
- /**
- * libXt is only needed on amd64
- */
- libraries =
- [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
- (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
-
- rpath = stdenv.lib.strings.makeLibraryPath libraries;
-
- passthru.mozillaPlugin = "/lib/plugins";
-
- passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
-
- passthru.home = result;
-
- # for backward compatibility
- passthru.architecture = "";
-
- meta = with stdenv.lib; {
- license = licenses.unfree;
- platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
- knownVulnerabilities = [ "Support ended in September 2018. Use OpenJDK or JDK 8." ];
- };
-
-}; in result
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 09677a47ab2..d90ddcaacfb 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
- version = "0.24.4";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
- sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6";
+ sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 81c935fc421..0832d14992d 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -4,18 +4,20 @@
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
- version = "3.3.3";
+ version = "3.3.7";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
- rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9";
- sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18";
+ rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a";
+ sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk";
};
+ nativeBuildInputs = [ makeWrapper ];
+
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
- buildInputs = [ makeWrapper ocaml findlib dune utop menhir ];
+ buildInputs = [ ocaml findlib dune utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 55348c5795a..e738dd7acae 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.28.0";
+ version = "1.29.2";
- # fetch hashes by running `print-hashes.sh 1.24.1`
+ # fetch hashes by running `print-hashes.sh 1.29.2`
hashes = {
- i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f";
- x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810";
- armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2";
- aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1";
- i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68";
- x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393";
+ i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
+ x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
+ armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
+ aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
+ i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
+ x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
};
platform =
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 25a71965e0b..02ea7ebbbfb 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,13 +1,10 @@
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
+, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, CoreFoundation, Security
, version
, patches ? []
, src }:
-let
- inherit (darwin.apple_sdk.frameworks) CoreFoundation;
-in
-
rustPlatform.buildRustPackage rec {
name = "cargo-${version}";
inherit version src patches;
@@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG=1;
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7d785093f9b..a925127596d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,4 +1,5 @@
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
+, CoreFoundation, Security
, targets ? []
, targetToolchains ? []
, targetPatches ? []
@@ -6,11 +7,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
- version = "1.29.1";
- cargoVersion = "1.29.1";
+ version = "1.30.0";
+ cargoVersion = "1.30.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
+ sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
};
in rec {
rustc = callPackage ./rustc.nix {
@@ -44,8 +45,7 @@ in rec {
cargo = callPackage ./cargo.nix rec {
version = cargoVersion;
- inherit src;
- inherit stdenv;
+ inherit src stdenv CoreFoundation Security;
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a054ed0eb55..decf14a3294 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -92,15 +92,15 @@ stdenv.mkDerivation {
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile tests.
- rm -vr src/test/run-make/linker-output-non-utf8 || true
- rm -vr src/test/run-make/issue-26092 || true
+ rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
+ rm -vr src/test/run-make-fulldeps/issue-26092 || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
- rm -vr src/test/run-pass/issue-36023.rs || true
+ rm -vr src/test/ui/run-pass/issue-36023.rs || true
# Disable test getting stuck on hydra - possible fix:
# https://reviews.llvm.org/rL281650
- rm -vr src/test/run-pass/issue-36474.rs || true
+ rm -vr src/test/ui/run-pass/issue-36474.rs || true
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
@@ -116,18 +116,18 @@ stdenv.mkDerivation {
# Disable all lldb tests.
# error: Can't run LLDB test because LLDB's python path is not set
rm -vr src/test/debuginfo/*
- rm -v src/test/run-pass/backtrace-debuginfo.rs
+ rm -v src/test/run-pass/backtrace-debuginfo.rs || true
# error: No such file or directory
- rm -v src/test/run-pass/issue-45731.rs
+ rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
# Disable tests that fail when sandboxing is enabled.
substituteInPlace src/libstd/sys/unix/ext/net.rs \
--replace '#[test]' '#[test] #[ignore]'
substituteInPlace src/test/run-pass/env-home-dir.rs \
--replace 'home_dir().is_some()' true
- rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes?
- rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ???
+ rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes?
+ rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ???
'';
# rustc unfortunately need cmake for compiling llvm-rt but doesn't
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 334ecbb168b..1ef6dd06570 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -5,17 +5,20 @@
# Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency.
, purgeNixReferences ? false
+, texinfo
}:
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.4.12";
+ version = "1.4.13";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a";
+ sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm";
};
+ buildInputs = [texinfo];
+
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
echo "
@@ -46,11 +49,6 @@ stdenv.mkDerivation rec {
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
# Fix the tests
- sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
@@ -83,6 +81,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
+ (cd doc/manual ; make info)
'';
installPhase = ''
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 233eb6647c0..bbfa1be8f92 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -32,11 +32,10 @@
, makeWrapper
, gnumake
, file
-#, systemtap
}:
let
- v_base = "4.1.3";
+ v_base = "4.2.1";
version = "${v_base}-RELEASE";
version_friendly = "${v_base}";
@@ -54,15 +53,15 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch {
repo = "swift-clang";
- sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h";
+ sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7";
};
llvm = fetch {
repo = "swift-llvm";
- sha256 = "0q5cv4iydm8c1kcax32573y3q2cbpihwgj5aa8ws1fnpy4jvq934";
+ sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
- sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl";
+ sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf";
};
cmark = fetch {
repo = "swift-cmark";
@@ -70,32 +69,32 @@ let
};
lldb = fetch {
repo = "swift-lldb";
- sha256 = "1d0pa7xm289bjb6r52hkkmlngkqkwbwgixnmm30bin2q18mkxk7s";
+ sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b";
};
llbuild = fetch {
repo = "swift-llbuild";
- sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1";
+ sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q";
};
pm = fetch {
repo = "swift-package-manager";
- sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3";
+ sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l";
};
xctest = fetch {
repo = "swift-corelibs-xctest";
- sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5";
+ sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8";
};
foundation = fetch {
repo = "swift-corelibs-foundation";
- sha256 = "1bhrag63rmz41bg2g6ap01qrdpq37hislgf5hg6myy2v69q7mahx";
+ sha256 = "1bfnkj8s3v327cy0czkngz0ryzmz7amjzkkxbsg2zyrhf9a9f0f7";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
- sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n";
+ sha256 = "0fibrx54nbaawhsgd7cbr356ji9qvf8y8ahd5bdx28fpj6q0cnwc";
fetchSubmodules = true;
};
swift = fetch {
repo = "swift";
- sha256 = "1ydx11pkvaasgjbr29lnha0lpnak758gd5l0aqzmp3q6mcyvfm7a";
+ sha256 = "0y277wi0m6zp1yph9s14mmc65m21q5fm6lgzkn2rkrbaz25fdzak";
};
};
@@ -111,7 +110,6 @@ let
ncurses
sqlite
swig
- # systemtap?
];
cmakeFlags = [
@@ -215,8 +213,11 @@ stdenv.mkDerivation rec {
substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
+ substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
+ --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift/utils/build-script-impl \
--replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
+ patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
'' + stdenv.lib.optionalString stdenv.needsPax ''
patch -p1 -d swift -i ${./patches/build-script-pax.patch}
'' + ''
@@ -228,24 +229,24 @@ stdenv.mkDerivation rec {
-e 's/^test-installable-package$/# \0/' \
-e 's/^test$/# \0/' \
-e 's/^validation-test$/# \0/' \
- -e 's/^long-test$/# \0/'
+ -e 's/^long-test$/# \0/' \
+ -e 's/^stress-test$/# \0/' \
+ -e 's/^test-optimized$/# \0/'
# https://bugs.swift.org/browse/SR-5779
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
- --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
- ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
+ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
+ patch -p1 -d clang -i ${./patches/llvm-include-dirs.patch}
patch -p1 -d clang -i ${./purity.patch}
# Workaround hardcoded dep on "libcurses" (vs "libncurses"):
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
- # This test fails on one of my machines, not sure why.
- # Disabling for now.
- rm llbuild/tests/Examples/buildsystem-capi.llbuild
-
PREFIX=''${out/#\/}
+ substituteInPlace swift-corelibs-foundation/build.py \
+ --replace usr/lib "$PREFIX/lib"
substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \
@@ -263,6 +264,7 @@ stdenv.mkDerivation rec {
# Extract the generated tarball into the store
PREFIX=''${out/#\/}
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
+ find $out -type d -empty -delete
paxmark pmr $out/bin/swift
paxmark pmr $out/bin/*
@@ -290,4 +292,3 @@ stdenv.mkDerivation rec {
broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
};
}
-
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
index 6ef83754a67..f2b30e5dcdb 100644
--- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -686,7 +686,7 @@ swiftpm
+@@ -717,7 +717,7 @@ swiftpm
xctest
dash-dash
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
index 66723f1cdf3..612b33cdb48 100644
--- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -708,7 +708,7 @@ install-lldb
+@@ -723,7 +723,7 @@ install-lldb
install-llbuild
install-swiftpm
install-xctest
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
index 5493196303c..e84c7eb2a08 100644
--- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s
+@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
index fa2ccdf9d5c..1f47bf8ee04 100644
--- a/pkgs/development/compilers/swift/patches/build-script-pax.patch
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -1,6 +1,6 @@
--- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600
+++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600
-@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() {
+@@ -1837,6 +1837,17 @@ function set_lldb_xcodebuild_options() {
fi
}
@@ -18,7 +18,7 @@
#
# Configure and build each product
#
-@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do
+@@ -2735,6 +2746,12 @@ for host in "${ALL_HOSTS[@]}"; do
fi
call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]}
diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
new file mode 100644
index 00000000000..650e1a2429d
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
@@ -0,0 +1,13 @@
+The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
+
+--- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200
++++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200
+@@ -65,7 +65,7 @@
+ endif()
+
+ set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
++ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+
+ if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/")
+ set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")
diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
new file mode 100644
index 00000000000..9523943c480
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
@@ -0,0 +1,13 @@
+Only use the Nix include dirs when no sysroot is configured.
+
+--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
++++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
+@@ -565,7 +565,7 @@
+
+ // Check for configure-time C include directories.
+ StringRef CIncludeDirs(C_INCLUDE_DIRS);
+- if (CIncludeDirs != "") {
++ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
+ SmallVector dirs;
+ CIncludeDirs.split(dirs, ":");
+ for (StringRef dir : dirs) {
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
index b30d0d0b5d5..d10e407260a 100644
--- a/pkgs/development/compilers/swift/purity.patch
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -11,7 +11,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -398,13 +398,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_static)) {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
new file mode 100644
index 00000000000..a26bc41c594
--- /dev/null
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub
+, automake, autoconf, readline
+, libX11, bluez, SDL2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "X11basic";
+ version = "1.26";
+ name = pname + "-" + version;
+
+ src = fetchFromGitHub {
+ owner = "kollokollo";
+ repo = pname;
+ rev = version;
+ sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
+ };
+
+ buildInputs = [
+ autoconf automake readline libX11 SDL2 bluez
+ ];
+
+ preConfigure = "cd src;autoconf";
+
+ configureFlags = [
+ "--with-bluetooth"
+ "--with-usb"
+ "--with-readline"
+ "--with-sdl"
+ "--with-x"
+ "--enable-cryptography"
+ ];
+
+ preInstall = ''
+ touch x11basic.{eps,svg}
+ mkdir -p $out/{bin,lib}
+ mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+ cp -r ../examples $out/share/.
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://x11-basic.sourceforge.net/;
+ description = "A Basic interpreter and compiler with graphics capabilities.";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
new file mode 100644
index 00000000000..cd7ddfefb84
--- /dev/null
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+let params =
+ {
+ "8.6" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+
+ "8.7" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+
+ "8.8" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-Velisarios-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "vrahli";
+ repo = "Velisarios";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ preBuild = "./create-makefile.sh";
+ installPhase = ''
+ mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios
+ cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios
+ '';
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index 9c24e77e0f7..bffa5172b0e 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
};
+ buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
patches = [./0001-changes-to-work-with-Coq-8.6.patch];
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 4587e08be48..94ed2945692 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchgit, coq, ssreflect }:
+{ stdenv, fetchgit, coq, ssreflect, equations }:
-let param =
- {
- "8.6" = {
+let
+ params =
+ let
+ v20180709 = {
version = "20180709";
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
};
-
- "8.7" = {
- version = "20180709";
- rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
- sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
+ v20181016 = {
+ version = "20181016";
+ rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208";
+ sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph";
};
-
- }."${coq.coq-version}"
-; in
+ in {
+ "8.6" = v20180709;
+ "8.7" = v20180709;
+ "8.8" = v20181016;
+ };
+ param = params."${coq.coq-version}";
+in
stdenv.mkDerivation rec {
@@ -26,8 +30,8 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
- buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
- propagatedBuildInputs = [ coq ssreflect ];
+ buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]);
+ propagatedBuildInputs = [ ssreflect equations ];
enableParallelBuilding = false;
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+ compatibleCoqVersions = v: builtins.hasAttr v params;
};
}
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index d12d3fefb94..a1ecdd610a3 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -1018,7 +1018,7 @@ let mkContrib = repo: revs: param:
sha256 = "0fp3vdl79c8d759qjhk42rjfpkd0ba4pcw572f5gxn28kfwz3rrj";
};
- zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" ] {
+ zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" "8.8" ] {
version = "v8.5.0-5-gbba3259";
rev = "bba325933370fea64780b1afa2fad54c1b567819";
sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn";
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 92c3c87774a..99a6fe311a0 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,6 +1,8 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchurl, coq, ncurses, which
+, graphviz, withDoc ? false
+}:
-let param =
+let params =
let param_1_7 = {
version = "1.7.0";
@@ -16,14 +18,48 @@ let param =
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
+ "8.9" = param_1_7;
- }."${coq.coq-version}"
-; in
+ };
+ param = params."${coq.coq-version}";
+in
-callPackage ./generic.nix {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-mathcomp-${param.version}";
+
src = fetchurl {
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
inherit (param) sha256;
};
+
+ nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+ buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+ enableParallelBuilding = true;
+
+ buildFlags = stdenv.lib.optionalString withDoc "doc";
+
+ preBuild = ''
+ patchShebangs etc/utils/ssrcoqdep || true
+ cd mathcomp
+ export COQBIN=${coq}/bin/
+ '';
+
+ installPhase = ''
+ make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+ '' + stdenv.lib.optionalString withDoc ''
+ make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+ platforms = coq.meta.platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.hasAttr v params;
+ };
+
}
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
deleted file mode 100644
index 2a602711965..00000000000
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name
-}:
-
-stdenv.mkDerivation {
-
- inherit name;
- inherit src;
-
- nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
- buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
- propagatedBuildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
- buildFlags = stdenv.lib.optionalString withDoc "doc";
-
- preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
- cd mathcomp
- export COQBIN=${coq}/bin/
- '';
-
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '' + stdenv.lib.optionalString withDoc ''
- make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
- license = licenses.cecill-b;
- maintainers = [ maintainers.vbgl maintainers.jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
- };
-
-}
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 9e9c3c7957a..840189e347a 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,6 +1,8 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchurl, coq, ncurses, which
+, graphviz, withDoc ? false
+}:
-let param =
+let params =
let param_1_7 = {
version = "1.7.0";
@@ -16,14 +18,49 @@ let param =
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
+ "8.9" = param_1_7;
- }."${coq.coq-version}"
-; in
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation {
-callPackage ./generic.nix {
name = "coq${coq.coq-version}-ssreflect-${param.version}";
src = fetchurl {
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
inherit (param) sha256;
};
+
+ nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+ buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+ enableParallelBuilding = true;
+
+ preBuild = ''
+ patchShebangs etc/utils/ssrcoqdep || true
+ cd mathcomp/ssreflect
+ export COQBIN=${coq}/bin/
+ '';
+
+ installPhase = ''
+ make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+ '';
+
+ postInstall = stdenv.lib.optionalString withDoc ''
+ mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+ cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = with maintainers; [ vbgl jwiegley ];
+ inherit (coq.meta) platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.hasAttr v params;
+ };
+
}
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
deleted file mode 100644
index 23e364cd960..00000000000
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name, patches ? []
-}:
-
-stdenv.mkDerivation {
-
- inherit name;
- inherit src;
-
- nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
- buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
- propagatedBuildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
- inherit patches;
-
- preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
- cd mathcomp/ssreflect
- export COQBIN=${coq}/bin/
- '';
-
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '';
-
- postInstall = ''
- # mkdir -p $out/bin
- # cp -p bin/ssrcoq $out/bin
- # cp -p bin/ssrcoq.byte $out/bin
- '' + stdenv.lib.optionalString withDoc ''
- mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
- cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
- license = licenses.cecill-b;
- maintainers = with maintainers; [ vbgl jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
- };
-
-}
diff --git a/pkgs/development/dhall-modules/default.nix b/pkgs/development/dhall-modules/default.nix
new file mode 100644
index 00000000000..b6632a86f31
--- /dev/null
+++ b/pkgs/development/dhall-modules/default.nix
@@ -0,0 +1,9 @@
+{ pkgs }:
+
+# TODO: add into the toplevel fixpoint instead of using rec
+rec {
+
+ prelude = prelude_3_0_0;
+ prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};
+
+}
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/pkgs/development/dhall-modules/prelude/v3.nix
new file mode 100644
index 00000000000..ef673310ceb
--- /dev/null
+++ b/pkgs/development/dhall-modules/prelude/v3.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ name = "dhall-prelude";
+
+ src = fetchFromGitHub {
+ owner = "dhall-lang";
+ repo = "dhall-lang";
+ # Commit where the v3.0.0 prelude folder was merged into dhall-lang
+ # and a LICENSE file has been added.
+ rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
+ sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
+ };
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ cp -r Prelude $out
+ '';
+
+ meta = {
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ Profpatsch ];
+ };
+}
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 3faa4c268ac..0e092473bd5 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -103,6 +103,7 @@ go.stdenv.mkDerivation (
'') + ''
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+ export GOCACHE=$TMPDIR/go-cache
runHook postConfigure
'';
@@ -193,9 +194,6 @@ go.stdenv.mkDerivation (
find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
'';
- # Disable go cache, which is not reused in nix anyway
- GOCACHE = "off";
-
shellHook = ''
d=$(mktemp -d "--suffix=-$name")
'' + toString (map (dep: ''
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2cb95a397c6..a34f510ccb9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw";
+ sha256 = "0mgmxcr36b86jh56my3vhp9y4cravi0hbppa463q3c21a1cmjc19";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -370,6 +370,7 @@ self: super: {
safecopy = dontCheck super.safecopy;
sai-shape-syb = dontCheck super.sai-shape-syb;
scp-streams = dontCheck super.scp-streams;
+ sdl2 = dontCheck super.sdl2; # the test suite needs an x server
sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
separated = dontCheck super.separated;
shadowsocks = dontCheck super.shadowsocks;
@@ -1064,11 +1065,11 @@ self: super: {
# The tool needs a newer hpack version than the one mandated by LTS-12.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: {
- hpack = self.hpack_0_31_0;
+ hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});
stack2nix = super.stack2nix.overrideScope (self: super: {
- hpack = self.hpack_0_31_0;
+ hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});
@@ -1147,10 +1148,10 @@ self: super: {
arbtt = doJailbreak super.arbtt;
- # https://github.com/yesodweb/yesod/issues/1563
- yesod-core = self.yesod-core_1_6_8_1;
-
# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;
+ # https://github.com/DanielG/cabal-helper/issues/59
+ cabal-helper = doJailbreak super.cabal-helper;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
deleted file mode 100644
index 85efecc8ed3..00000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ /dev/null
@@ -1,239 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_35;
-
- # Disable GHC 7.10.x core libraries.
- array = null;
- base = null;
- binary = null;
- bin-package-db = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # These are now core libraries in GHC 8.4.x.
- mtl = self.mtl_2_2_2;
- parsec = self.parsec_3_1_13_0;
- parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
- stm = self.stm_2_5_0_0;
- text = self.text_1_2_3_1;
-
- # Build jailbreak-cabal with the latest version of Cabal.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
-
- gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
-
- # https://github.com/mrkkrp/megaparsec/issues/282
- megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
-
- Extra = appendPatch super.Extra (pkgs.fetchpatch {
- url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
- sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
- });
-
- # Requires ghc 8.2
- ghc-proofs = dontDistribute super.ghc-proofs;
-
- # haddock: No input file(s).
- nats = dontHaddock super.nats;
- bytestring-builder = dontHaddock super.bytestring-builder;
-
- # Setup: At least the following dependencies are missing: base <4.8
- hspec-expectations = overrideCabal super.hspec-expectations (drv: {
- postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
- });
- utf8-string = overrideCabal super.utf8-string (drv: {
- postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
- });
-
- # acid-state/safecopy#25 acid-state/safecopy#26
- safecopy = dontCheck (super.safecopy);
-
- # test suite broken, some instance is declared twice.
- # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
- AttoBencode = dontCheck super.AttoBencode;
-
- # Test suite fails with some (seemingly harmless) error.
- # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
- syb = dontCheck super.syb;
-
- # Test suite has stricter version bounds
- retry = dontCheck super.retry;
-
- # test/System/Posix/Types/OrphansSpec.hs:19:13:
- # Not in scope: type constructor or class ‘Int32’
- base-orphans = dontCheck super.base-orphans;
-
- # Test suite fails with time >= 1.5
- http-date = dontCheck super.http-date;
-
- # Version 1.19.5 fails its test suite.
- happy = dontCheck super.happy;
-
- # Upstream was notified about the over-specified constraint on 'base'
- # but refused to do anything about it because he "doesn't want to
- # support a moving target". Go figure.
- barecheck = doJailbreak super.barecheck;
-
- # https://github.com/kazu-yamamoto/unix-time/issues/30
- unix-time = dontCheck super.unix-time;
-
- # diagrams/monoid-extras#19
- monoid-extras = overrideCabal super.monoid-extras (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
- });
-
- # diagrams/statestack#5
- statestack = overrideCabal super.statestack (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal";
- });
-
- # diagrams/diagrams-core#83
- diagrams-core = overrideCabal super.diagrams-core (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
- });
-
- timezone-olson = doJailbreak super.timezone-olson;
- xmonad-extras = overrideCabal super.xmonad-extras (drv: {
- postPatch = ''
- sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
- '';
- });
-
- # Workaround for a workaround, see comment for "ghcjs" flag.
- jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
- in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
- self.webkitgtk3-javascriptcore ];
-
- # https://github.com/lymar/hastache/issues/47
- hastache = dontCheck super.hastache;
-
- # The compat library is empty in the presence of mtl 2.2.x.
- mtl-compat = dontHaddock super.mtl-compat;
-
- # https://github.com/bos/bloomfilter/issues/11
- bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts");
-
- # https://github.com/ocharles/tasty-rerun/issues/5
- tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
-
- # http://hub.darcs.net/ivanm/graphviz/issue/5
- graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
-
- # https://github.com/HugoDaniel/RFC3339/issues/14
- timerep = dontCheck super.timerep;
-
- # Required to fix version 0.91.0.0.
- wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
-
- # Inexplicable haddock failure
- # https://github.com/gregwebs/aeson-applicative/issues/2
- aeson-applicative = dontHaddock super.aeson-applicative;
-
- # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
- hwsl2 = dontCheck super.hwsl2;
-
- # https://github.com/haskell/haddock/issues/427
- haddock = dontCheck self.haddock_2_16_1;
-
- # haddock-api >= 2.17 is GHC 8.0 only
- haddock-api = self.haddock-api_2_16_1;
- haddock-library = self.haddock-library_1_2_1;
-
- # The tests in vty-ui do not build, but vty-ui itself builds.
- vty-ui = enableCabalFlag super.vty-ui "no-tests";
-
- # https://github.com/fpco/stackage/issues/1112
- vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ];
-
- # vector with ghc < 8.0 needs semigroups
- vector = addBuildDepend super.vector self.semigroups;
-
- # too strict dependency on directory
- tasty-ant-xml = doJailbreak super.tasty-ant-xml;
-
- # https://github.com/thoughtpolice/hs-ed25519/issues/13
- ed25519 = dontCheck super.ed25519;
-
- # Breaks a dependency cycle between QuickCheck and semigroups
- hashable = dontCheck super.hashable;
- unordered-containers = dontCheck super.unordered-containers;
-
- # GHC versions prior to 8.x require additional build inputs.
- aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
- ansi-wl-pprint = addBuildDepend super.ansi-wl-pprint self.semigroups;
- attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
- bytes = addBuildDepend super.bytes self.doctest;
- case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
- cmdargs = addBuildDepend super.cmdargs self.semigroups;
- contravariant = addBuildDepend super.contravariant self.semigroups;
- dependent-map = addBuildDepend super.dependent-map self.semigroups;
- distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
- Glob = addBuildDepends super.Glob (with self; [semigroups]);
- hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
- hslogger = addBuildDepend super.hslogger self.HUnit;
- intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
- lens = addBuildDepend super.lens self.generic-deriving;
- mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
- natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
- optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
- parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
- QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
- reflection = addBuildDepend super.reflection self.semigroups;
- semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
- tar = addBuildDepend super.tar self.semigroups;
- texmath = addBuildDepend super.texmath self.network-uri;
- yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
-
- # cereal must have `fail` in pre-ghc-8.0.x versions and tests require
- # bytestring>=0.10.8.1.
- cereal = dontCheck (addBuildDepend super.cereal self.fail);
-
- # The test suite requires Cabal 1.24.x or later to compile.
- comonad = dontCheck super.comonad;
- semigroupoids = dontCheck super.semigroupoids;
-
- # Newer versions require base >=4.9 && <5.
- colour = self.colour_2_3_3;
-
- # https://github.com/atzedijkstra/chr/issues/1
- chr-pretty = doJailbreak super.chr-pretty;
- chr-parse = doJailbreak super.chr-parse;
-
- # The autogenerated Nix expressions don't take into
- # account `if impl(ghc >= x.y)`, which is a common method to depend
- # on `semigroups` or `fail` when building with GHC < 8.0.
- system-filepath = addBuildDepend super.system-filepath self.semigroups;
- haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups;
- free = addBuildDepend super.free self.fail;
-
- # Newer versions don't build without base-4.9
- resourcet = self.resourcet_1_1_11;
- conduit = self.conduit_1_2_13_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
deleted file mode 100644
index 43f769ff6fd..00000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_37;
-
- # Disable GHC 8.0.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-compact = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # These are now core libraries in GHC 8.4.x.
- mtl = self.mtl_2_2_2;
- parsec = self.parsec_3_1_13_0;
- stm = self.stm_2_5_0_0;
- text = self.text_1_2_3_1;
-
- # https://github.com/bmillwood/applicative-quoters/issues/6
- applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
- sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
- });
-
- # Requires ghc 8.2
- ghc-proofs = dontDistribute super.ghc-proofs;
-
- # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
- yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
-
- # https://github.com/nominolo/ghc-syb/issues/20
- ghc-syb-utils = dontCheck super.ghc-syb-utils;
-
- # Newer versions require ghc>=8.2
- apply-refact = super.apply-refact_0_3_0_1;
-
- # This builds needs the latest Cabal version.
- cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
-
- # Add appropriate Cabal library to build this code.
- stack = addSetupDepend super.stack self.Cabal_2_0_1_1;
-
- # inline-c > 0.5.6.0 requires template-haskell >= 2.12
- inline-c = super.inline-c_0_5_6_1;
- inline-c-cpp = super.inline-c-cpp_0_1_0_0;
-
- # test dep hedgehog pulls in concurrent-output, which does not build
- # due to processing version mismatch
- either = dontCheck super.either;
-
- # test dep tasty has a version mismatch
- indents = dontCheck super.indents;
-
- # Newer versions require GHC 8.2.
- haddock-library = self.haddock-library_1_4_3;
- haddock-api = self.haddock-api_2_17_4;
- haddock = self.haddock_2_17_5;
-
- # GHC 8.0 doesn't have semigroups included by default
- ListLike = addBuildDepend super.ListLike self.semigroups;
-
- # Add missing build depedency for this compiler.
- base-compat-batteries = addBuildDepend super.base-compat-batteries self.bifunctors;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8d0669ca2ac..226b437d58b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -56,8 +56,19 @@ self: super: {
};
in appendPatch super.hadoop-rpc patch;
- # Version 1.9.1 needs Cabal 2.4.x or later, so
- # we use the one from the ghc-8.6.1 package set.
- stack = markBroken super.stack;
+ # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent
+ # version of yaml. Go figure. We avoid overrideScope here because using it to
+ # change Cabal would re-compile every single package instead of just those
+ # that have it as an actual library dependency. The explicit overrides are
+ # more verbose but friendlier for Hydra.
+ stack = (doJailbreak super.stack).override {
+ Cabal = self.Cabal_2_4_0_1;
+ hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; };
+ yaml = self.yaml_0_11_0_0;
+ hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
+ };
+ hpack_0_31_1 = super.hpack_0_31_1.override {
+ yaml = self.yaml_0_11_0_0;
+ };
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index ca2c8849dc6..4276de9f90d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
# LTS-12.x versions do not compile.
base-orphans = self.base-orphans_0_8;
- brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188
+ brick = self.brick_0_41_2;
cassava-megaparsec = doJailbreak super.cassava-megaparsec;
config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
contravariant = self.contravariant_1_5;
@@ -56,12 +56,12 @@ self: super: {
hledger = doJailbreak super.hledger;
hledger-lib = doJailbreak super.hledger-lib;
hledger-ui = doJailbreak super.hledger-ui;
- hpack = self.hpack_0_31_0;
+ hpack = self.hpack_0_31_1;
hslua = self.hslua_1_0_1;
hslua-module-text = self.hslua-module-text_0_2_0;
- hspec = self.hspec_2_5_8;
- hspec-core = self.hspec-core_2_5_8;
- hspec-discover = self.hspec-discover_2_5_8;
+ hspec = self.hspec_2_6_0;
+ hspec-core = self.hspec-core_2_6_0;
+ hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_5_6;
JuicyPixels = self.JuicyPixels_3_3_2;
@@ -69,11 +69,12 @@ self: super: {
megaparsec = dontCheck (doJailbreak super.megaparsec);
neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF
patience = markBrokenVersion "0.1.1" super.patience;
+ polyparse = self.polyparse_1_12_1;
primitive = self.primitive_0_6_4_0;
QuickCheck = self.QuickCheck_2_12_6_1;
semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6;
- vty = self.vty_5_25;
+ vty = self.vty_5_25_1;
wizards = doJailbreak super.wizards;
wl-pprint-extras = doJailbreak super.wl-pprint-extras;
yaml = self.yaml_0_11_0_0;
@@ -90,7 +91,6 @@ self: super: {
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
Diff = dontCheck super.Diff;
http-api-data = doJailbreak super.http-api-data;
- lucid = doJailbreak super.lucid;
persistent-sqlite = dontCheck super.persistent-sqlite;
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
@@ -100,34 +100,16 @@ self: super: {
# https://github.com/bmillwood/haskell-src-meta/pull/80
haskell-src-meta = doJailbreak super.haskell-src-meta;
- # The official 1.12 release is broken and unmaintained.
- polyparse = appendPatch (overrideCabal super.polyparse (drv: { editedCabalFile = null; })) (pkgs.fetchpatch {
- url = https://github.com/bergmark/polyparse/commit/8a69ee7e57db798c106d8b56dce05b1dfc4fed37.patch;
- sha256 = "11r73wx1w6bfrkrnk6r9k7rfzp6qrvkdikb2by37ld06c0w6nn57";
- });
-
# https://github.com/skogsbaer/HTF/issues/69
HTF = markBrokenVersion "0.13.2.4" super.HTF;
- # https://github.com/jgm/pandoc-types/issues/52
- pandoc-types = doJailbreak super.pandoc-types;
-
- #
+ # https://github.com/jgm/skylighting/issues/55
skylighting-core = dontCheck super.skylighting-core;
- # https://github.com/joelburget/easytest/issues/12
- easytest = appendPatch super.easytest (pkgs.fetchpatch {
- url = https://github.com/joelburget/easytest/pull/13.patch;
- sha256 = "0gnsgga8x2yxyg27pya6rhmxfsxf167vsi4xdj98fn8v0j7zz1v1";
- });
-
# https://github.com/jgm/pandoc/issues/4974
- pandoc = doJailbreak super.pandoc_2_3_1;
+ pandoc = doJailbreak super.pandoc_2_4;
# Break out of "yaml >=0.10.4.0 && <0.11".
stack = doJailbreak super.stack;
- # https://github.com/vimus/libmpd-haskell/issues/109
- xmobar = disableCabalFlag (super.xmobar.override { libmpd = null; }) "with_mpd";
-
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8b469e6c0f5..0a2770cc4c0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-compiler: ghc-8.4.3
+compiler: ghc-8.4.4
core-packages:
- array-0.5.2.0
@@ -12,12 +12,12 @@ core-packages:
- deepseq-1.4.3.0
- directory-1.3.1.5
- filepath-1.4.2
- - ghc-8.4.3
- - ghc-boot-8.4.3
- - ghc-boot-th-8.4.3
+ - ghc-8.4.4
+ - ghc-boot-8.4.4
+ - ghc-boot-th-8.4.4
- ghc-compact-0.1.0.0
- ghc-prim-0.5.2.0
- - ghci-8.4.3
+ - ghci-8.4.4
- haskeline-0.7.4.2
- hpc-0.6.0.3
- integer-gmp-1.0.2.0
@@ -26,10 +26,10 @@ core-packages:
- pretty-1.1.3.6
- process-1.6.3.0
- rts-1.0
- - stm-2.4.5.0
+ - stm-2.4.5.1
- template-haskell-2.13.0.0
- terminfo-0.4.1.1
- - text-1.2.3.0
+ - text-1.2.3.1
- time-1.8.0.2
- transformers-0.5.5.0
- unix-2.7.2.2
@@ -45,7 +45,7 @@ default-package-overrides:
- base-compat-batteries ==0.10.1
# Newer versions don't work in LTS-12.x
- cassava-megaparsec < 2
- # LTS Haskell 12.13
+ # LTS Haskell 12.16
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -78,7 +78,7 @@ default-package-overrides:
- alarmclock ==0.5.0.2
- alerts ==0.1.0.0
- alex ==3.2.4
- - alg ==0.2.7.0
+ - alg ==0.2.8.0
- algebra ==4.3.1
- algebraic-graphs ==0.2
- Allure ==0.8.3.0
@@ -180,7 +180,7 @@ default-package-overrides:
- amazonka-xray ==1.6.0
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- - ansi-terminal ==0.8.1
+ - ansi-terminal ==0.8.2
- ansi-wl-pprint ==0.6.8.2
- ANum ==0.2.0.2
- api-field-json-th ==0.1.0.2
@@ -233,7 +233,7 @@ default-package-overrides:
- base64-bytestring ==1.0.0.1
- base64-bytestring-type ==1
- base64-string ==0.2
- - base-compat ==0.10.4
+ - base-compat ==0.10.5
- base-compat-batteries ==0.10.1
- basement ==0.0.8
- base-orphans ==0.7
@@ -253,7 +253,7 @@ default-package-overrides:
- bimap ==0.3.3
- bimap-server ==0.1.0.1
- binary-bits ==0.5
- - binary-conduit ==1.3
+ - binary-conduit ==1.3.1
- binary-ext ==2.0.4
- binary-ieee754 ==0.1.0.0
- binary-list ==1.1.1.2
@@ -335,7 +335,7 @@ default-package-overrides:
- Cabal ==2.2.0.1
- cabal2spec ==2.1.1
- cabal-doctest ==1.0.6
- - cabal-rpm ==0.12.5
+ - cabal-rpm ==0.12.6
- cache ==0.1.1.1
- cachix ==0.1.2
- cachix-api ==0.1.0.2
@@ -404,7 +404,7 @@ default-package-overrides:
- clr-marshal ==0.2.0.0
- clumpiness ==0.17.0.0
- ClustalParser ==1.2.3
- - cmark-gfm ==0.1.5
+ - cmark-gfm ==0.1.6
- cmdargs ==0.10.20
- code-builder ==0.1.3
- codec ==0.2.1
@@ -436,7 +436,7 @@ default-package-overrides:
- concurrency ==1.6.1.0
- concurrent-extra ==0.7.0.12
- concurrent-output ==1.10.7
- - concurrent-split ==0.0.1
+ - concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.3.1
@@ -461,7 +461,7 @@ default-package-overrides:
- contravariant ==1.4.1
- contravariant-extras ==0.3.4
- control-bool ==0.2.1
- - control-dsl ==0.2.1.1
+ - control-dsl ==0.2.1.3
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.1
- convertible ==1.1.1.0
@@ -486,7 +486,7 @@ default-package-overrides:
- crypto-cipher-tests ==0.0.11
- crypto-cipher-types ==0.0.9
- cryptocompare ==0.1.1
- - crypto-enigma ==0.0.2.13
+ - crypto-enigma ==0.0.2.14
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
@@ -552,7 +552,7 @@ default-package-overrides:
- data-serializer ==0.3.4
- datasets ==0.2.5
- data-textual ==0.3.0.2
- - data-tree-print ==0.1.0.1
+ - data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0
- DAV ==1.3.2
- dawg-ord ==0.5.1.0
@@ -576,7 +576,7 @@ default-package-overrides:
- dhall ==1.15.1
- dhall-bash ==1.0.15
- dhall-json ==1.2.3
- - dhall-text ==1.0.12
+ - dhall-text ==1.0.13
- di ==1.0.1
- diagrams ==1.4
- diagrams-builder ==0.8.0.3
@@ -638,7 +638,7 @@ default-package-overrides:
- dyre ==0.8.12
- Earley ==0.12.1.0
- easy-file ==0.2.2
- - easytest ==0.2
+ - easytest ==0.2.1
- Ebnf2ps ==1.0.15
- echo ==0.1.3
- ed25519 ==0.0.5.0
@@ -659,7 +659,7 @@ default-package-overrides:
- eliminators ==0.4.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- - email-validate ==2.3.2.7
+ - email-validate ==2.3.2.8
- enclosed-exceptions ==1.0.3
- entropy ==0.4.1.3
- enummapset ==0.5.2.2
@@ -702,7 +702,7 @@ default-package-overrides:
- exp-pairs ==0.1.6.0
- extensible ==0.4.9
- extensible-exceptions ==0.1.1.4
- - extra ==1.6.12
+ - extra ==1.6.13
- extractable-singleton ==0.0.1
- extrapolate ==0.3.3
- facts ==0.0.1.0
@@ -784,7 +784,7 @@ default-package-overrides:
- fuzzcheck ==0.1.1
- fuzzy-dates ==0.1.1.1
- fuzzyset ==0.1.0.6
- - gauge ==0.2.3
+ - gauge ==0.2.4
- gc ==0.0.2
- gd ==3000.7.3
- gdax ==0.6.0.0
@@ -880,6 +880,12 @@ default-package-overrides:
- greskell-core ==0.1.2.4
- greskell-websocket ==0.1.1.2
- groom ==0.1.2.1
+ - groundhog ==0.9.0
+ - groundhog-inspector ==0.9.0
+ - groundhog-mysql ==0.9.0
+ - groundhog-postgresql ==0.9.0.1
+ - groundhog-sqlite ==0.9.0
+ - groundhog-th ==0.9.0.1
- groups ==0.4.1.0
- gtk ==0.14.10
- gtk2hs-buildtools ==0.13.4.0
@@ -896,7 +902,7 @@ default-package-overrides:
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- - hapistrano ==0.3.6.0
+ - hapistrano ==0.3.7.0
- happstack-server ==7.5.1.1
- happy ==1.19.9
- hasbolt ==0.1.3.0
@@ -982,7 +988,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- Hoed ==0.5.1
- hoopl ==3.10.2.2
- - hOpenPGP ==2.7.3
+ - hOpenPGP ==2.7.4.1
- hopenpgp-tools ==0.21.2
- hopfli ==0.2.2.1
- hostname ==1.0
@@ -1044,7 +1050,7 @@ default-package-overrides:
- htaglib ==1.2.0
- HTF ==0.13.2.4
- html ==1.0.1.2
- - html-conduit ==1.3.1
+ - html-conduit ==1.3.2
- html-email-validate ==0.2.0.0
- html-entities ==1.1.4.2
- html-entity-map ==0.1.0.0
@@ -1118,7 +1124,7 @@ default-package-overrides:
- Imlib ==0.1.2
- immortal ==0.3
- include-file ==0.1.0.3
- - incremental-parser ==0.3.1.1
+ - incremental-parser ==0.3.2
- indentation-core ==0.0.0.2
- indentation-parsec ==0.0.0.2
- indents ==0.5.0.0
@@ -1136,7 +1142,7 @@ default-package-overrides:
- integration ==0.2.1
- intern ==0.9.2
- interpolate ==0.2.0
- - interpolatedstring-perl6 ==1.0.0
+ - interpolatedstring-perl6 ==1.0.1
- interpolation ==0.1.0.3
- IntervalMap ==0.6.0.0
- intervals ==0.8.1
@@ -1154,7 +1160,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.0.2
- ip ==1.3.0
- ip6addr ==1.0.0
- - iproute ==1.7.5
+ - iproute ==1.7.6
- IPv6Addr ==1.1.1
- IPv6DB ==0.3.1
- ipython-kernel ==0.9.1.0
@@ -1228,7 +1234,7 @@ default-package-overrides:
- lawful ==0.1.0.0
- lazyio ==0.1.0.4
- lca ==0.3.1
- - leancheck ==0.7.5
+ - leancheck ==0.7.7
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.3
- lens ==4.16.1
@@ -1248,7 +1254,7 @@ default-package-overrides:
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
- - libmpd ==0.9.0.8
+ - libmpd ==0.9.0.9
- libxml-sax ==0.7.5
- LibZip ==1.0.1
- lifted-async ==0.10.0.3
@@ -1283,7 +1289,7 @@ default-package-overrides:
- loop ==0.3.0
- lrucache ==1.2.0.0
- lrucaching ==0.3.3
- - lucid ==2.9.10
+ - lucid ==2.9.11
- lucid-extras ==0.1.0.1
- lxd-client-config ==0.1.0.1
- lz4 ==0.2.3.1
@@ -1303,7 +1309,7 @@ default-package-overrides:
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- marvin-interpolate ==1.1.2
- - massiv ==0.2.1.0
+ - massiv ==0.2.2.0
- massiv-io ==0.1.4.0
- mathexpr ==0.3.0.0
- math-functions ==0.2.1.0
@@ -1351,7 +1357,7 @@ default-package-overrides:
- mintty ==0.1.2
- miso ==0.21.2.0
- missing-foreign ==0.1.1
- - MissingH ==1.4.0.1
+ - MissingH ==1.4.1.0
- mixed-types-num ==0.3.1.4
- mltool ==0.2.0.1
- mmap ==0.5.9
@@ -1370,7 +1376,7 @@ default-package-overrides:
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- monadlist ==0.0.2
- - monad-logger ==0.3.29
+ - monad-logger ==0.3.30
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.10
- monad-logger-syslog ==0.1.4.0
@@ -1522,8 +1528,8 @@ default-package-overrides:
- pagination ==0.2.1
- palette ==0.3.0.1
- pandoc ==2.2.1
- - pandoc-citeproc ==0.14.5
- - pandoc-types ==1.17.5.1
+ - pandoc-citeproc ==0.14.8
+ - pandoc-types ==1.17.5.4
- pango ==0.13.5.0
- papillon ==0.1.0.6
- parallel ==3.2.2.0
@@ -1746,7 +1752,7 @@ default-package-overrides:
- require ==0.2.1
- req-url-extra ==0.1.0.0
- reroute ==0.5.0.0
- - resolv ==0.1.1.1
+ - resolv ==0.1.1.2
- resource-pool ==0.2.3.2
- resourcet ==1.2.2
- rest-stringmap ==0.2.0.7
@@ -1754,7 +1760,7 @@ default-package-overrides:
- rethinkdb-client-driver ==0.0.25
- retry ==0.7.7.0
- rev-state ==0.1.2
- - rfc5051 ==0.1.0.3
+ - rfc5051 ==0.1.0.4
- rhine ==0.4.0.1
- riak ==1.1.2.5
- riak-protobuf ==0.23.0.0
@@ -1785,8 +1791,8 @@ default-package-overrides:
- sandman ==0.2.0.1
- say ==0.1.0.1
- sbp ==2.3.17
- - SCalendar ==1.1.0
- scalendar ==1.2.0
+ - SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@@ -1841,7 +1847,7 @@ default-package-overrides:
- servant-streaming ==0.3.0.0
- servant-streaming-client ==0.3.0.0
- servant-streaming-server ==0.3.0.0
- - servant-swagger ==1.1.5
+ - servant-swagger ==1.1.6
- servant-swagger-ui ==0.3.0.3.13.2
- servant-swagger-ui-core ==0.3.1
- servant-tracing ==0.1.0.2
@@ -1859,7 +1865,7 @@ default-package-overrides:
- SHA ==1.6.4.4
- shake ==0.16.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.18
+ - shakespeare ==2.0.19
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
- shelltestrunner ==1.9
@@ -1871,6 +1877,7 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
+ - simple-cmd ==0.1.1
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.27
- simplest-sqlite ==0.1.0.0
@@ -1880,11 +1887,11 @@ default-package-overrides:
- singleton-nats ==0.4.2
- singletons ==2.4.1
- siphash ==1.0.3
- - size-based ==0.1.1.0
+ - size-based ==0.1.2.0
- skein ==1.0.9.4
- skylighting ==0.7.4
- skylighting-core ==0.7.4
- - slack-web ==0.2.0.6
+ - slack-web ==0.2.0.7
- slave-thread ==1.0.2
- smallcheck ==1.1.5
- smoothie ==0.4.2.9
@@ -1951,7 +1958,7 @@ default-package-overrides:
- storable-record ==0.0.4
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- - store ==0.5.0
+ - store ==0.5.0.1
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.24.4
@@ -2041,7 +2048,7 @@ default-package-overrides:
- test-framework-th ==0.2.4
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- - texmath ==0.11.1.1
+ - texmath ==0.11.1.2
- text ==1.2.3.1
- text-binary ==0.2.1.1
- text-builder ==0.5.4.3
@@ -2132,7 +2139,7 @@ default-package-overrides:
- type-level-kv-list ==1.1.0
- type-level-numbers ==0.1.1.1
- typelits-witnesses ==0.3.0.3
- - typenums ==0.1.2
+ - typenums ==0.1.2.1
- type-of-html ==1.4.0.1
- type-of-html-static ==0.1.0.2
- type-operators ==0.1.0.4
@@ -2152,7 +2159,7 @@ default-package-overrides:
- unicode-show ==0.1.0.3
- unicode-transforms ==0.3.4
- unification-fd ==0.10.0.1
- - union ==0.1.1.2
+ - union ==0.1.2
- union-find ==0.2
- uniplate ==1.6.12
- uniprot-kb ==0.1.2.0
@@ -2332,29 +2339,29 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yaml ==0.8.32
- yeshql ==4.1.0.1
- - yeshql-core ==4.1.0.1
- - yeshql-hdbc ==4.1.0.1
+ - yeshql-core ==4.1.0.2
+ - yeshql-hdbc ==4.1.0.2
- yesod ==1.6.0
- yesod-alerts ==0.1.2.0
- - yesod-auth ==1.6.4.1
+ - yesod-auth ==1.6.5
- yesod-auth-fb ==1.9.1
- yesod-auth-hashdb ==1.7
- yesod-bin ==1.6.0.3
- - yesod-core ==1.6.8
+ - yesod-core ==1.6.8.1
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
- - yesod-form ==1.6.2
+ - yesod-form ==1.6.3
- yesod-form-bootstrap4 ==1.0.2
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.0.0
- yesod-newsfeed ==1.6.1.0
- yesod-paginator ==1.1.0.1
- - yesod-persistent ==1.6.0
+ - yesod-persistent ==1.6.0.1
- yesod-recaptcha2 ==0.2.4
- yesod-sitemap ==1.6.0
- - yesod-static ==1.6.0
- - yesod-test ==1.6.5
+ - yesod-static ==1.6.0.1
+ - yesod-test ==1.6.5.1
- yesod-text-markdown ==0.1.10
- yesod-websockets ==0.3.0.1
- yes-precure5-command ==5.5.3
@@ -2579,6 +2586,7 @@ dont-distribute-packages:
fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ]
fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ]
fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fltkhs-themes: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2878,6 +2886,7 @@ dont-distribute-packages:
arpa: [ i686-linux, x86_64-linux, x86_64-darwin ]
arpack: [ i686-linux, x86_64-linux, x86_64-darwin ]
array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ arraylist: [ i686-linux, x86_64-linux, x86_64-darwin ]
ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ]
arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ]
arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3024,6 +3033,7 @@ dont-distribute-packages:
barrie: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ base-compat-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-feature-macros: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3047,6 +3057,7 @@ dont-distribute-packages:
beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
beamable: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bearriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ]
bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ]
beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3353,6 +3364,7 @@ dont-distribute-packages:
campfire: [ i686-linux, x86_64-linux, x86_64-darwin ]
canon: [ i686-linux, x86_64-linux, x86_64-darwin ]
canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ canonical-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-log: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3606,6 +3618,7 @@ dont-distribute-packages:
combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ]
Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ]
combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ comfort-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
comic: [ i686-linux, x86_64-linux, x86_64-darwin ]
Command: [ i686-linux, x86_64-linux, x86_64-darwin ]
commander: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3672,6 +3685,7 @@ dont-distribute-packages:
conduit-tokenize-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
conduit-zstd: [ i686-linux, x86_64-linux, x86_64-darwin ]
conf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ confcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]
conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ]
confide: [ i686-linux, x86_64-linux, x86_64-darwin ]
config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3830,6 +3844,7 @@ dont-distribute-packages:
ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ]
cube: [ i686-linux, x86_64-linux, x86_64-darwin ]
cubical: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ]
cudd: [ i686-linux, x86_64-linux, x86_64-darwin ]
currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4239,6 +4254,7 @@ dont-distribute-packages:
ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
ehs: [ i686-linux, x86_64-linux, x86_64-darwin ]
eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ eigen: [ i686-linux, x86_64-linux, x86_64-darwin ]
Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ]
either-list-functions: [ i686-linux, x86_64-linux, x86_64-darwin ]
EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4289,6 +4305,7 @@ dont-distribute-packages:
enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
enummapset-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ envstatus: [ i686-linux, x86_64-linux, x86_64-darwin ]
epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
epass: [ i686-linux, x86_64-linux, x86_64-darwin ]
epic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4360,6 +4377,7 @@ dont-distribute-packages:
execs: [ i686-linux, x86_64-linux, x86_64-darwin ]
executor: [ i686-linux, x86_64-linux, x86_64-darwin ]
exference: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ]
exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
exif: [ i686-linux, x86_64-linux, x86_64-darwin ]
exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4889,6 +4907,7 @@ dont-distribute-packages:
goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
goatee: [ i686-linux, x86_64-linux, x86_64-darwin ]
gochan: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ godot-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-adexchange-buyer: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-adexchange-seller: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5344,6 +5363,7 @@ dont-distribute-packages:
haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5439,6 +5459,14 @@ dont-distribute-packages:
haskore: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasktags: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-ffi-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-ffi-thc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-indef: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures-partial: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures-support: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-zoo: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5472,6 +5500,7 @@ dont-distribute-packages:
HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
hats: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hatt: [ i686-linux, x86_64-linux, x86_64-darwin ]
haverer: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ]
hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5583,6 +5612,7 @@ dont-distribute-packages:
Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ]
hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
hermit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ herms: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5606,6 +5636,7 @@ dont-distribute-packages:
hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ]
hext: [ i686-linux, x86_64-linux, x86_64-darwin ]
heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ heyting-algebras: [ i686-linux, x86_64-linux, x86_64-darwin ]
hF2: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfann: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfd: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5915,6 +5946,7 @@ dont-distribute-packages:
hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6493,6 +6525,8 @@ dont-distribute-packages:
KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ]
KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ]
kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kind-apply: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kind-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
kit: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmeans-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6644,6 +6678,7 @@ dont-distribute-packages:
lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lens-typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ]
lensref: [ i686-linux, x86_64-linux, x86_64-darwin ]
level-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
Level0: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6686,6 +6721,7 @@ dont-distribute-packages:
life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifted-base-tf: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lifted-stm: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
ligature: [ i686-linux, x86_64-linux, x86_64-darwin ]
lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6987,6 +7023,8 @@ dont-distribute-packages:
MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ]
MetaObject: [ i686-linux, x86_64-linux, x86_64-darwin ]
metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ metar-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ metar: [ i686-linux, x86_64-linux, x86_64-darwin ]
metric: [ i686-linux, x86_64-linux, x86_64-darwin ]
Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ]
metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7126,6 +7164,7 @@ dont-distribute-packages:
monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoids: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monopati: [ i686-linux, x86_64-linux, x86_64-darwin ]
monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ]
monzo: [ i686-linux, x86_64-linux, x86_64-darwin ]
moo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7145,6 +7184,7 @@ dont-distribute-packages:
mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ]
mp: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mpi-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpris: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7664,6 +7704,7 @@ dont-distribute-packages:
persistent-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ persistent-template-classy: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ]
persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7747,6 +7788,7 @@ dont-distribute-packages:
plan-b: [ i686-linux, x86_64-linux, x86_64-darwin ]
planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
planb-token-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ planet-mitchell-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
planet-mitchell: [ i686-linux, x86_64-linux, x86_64-darwin ]
plankton: [ i686-linux, x86_64-linux, x86_64-darwin ]
plat: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8333,6 +8375,7 @@ dont-distribute-packages:
rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosso: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rounded: [ i686-linux, x86_64-linux, x86_64-darwin ]
rounding: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8535,6 +8578,7 @@ dont-distribute-packages:
servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-http2-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-js: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8554,6 +8598,8 @@ dont-distribute-packages:
servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-streaming-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-swagger-ui-jensoleg: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-swagger-ui-redoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8602,6 +8648,7 @@ dont-distribute-packages:
shaker: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shannon-fano: [ i686-linux, x86_64-linux, x86_64-darwin ]
shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
shapes-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8620,6 +8667,7 @@ dont-distribute-packages:
shellish: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shh: [ i686-linux, x86_64-linux, x86_64-darwin ]
shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ]
shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ]
shoap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8640,6 +8688,7 @@ dont-distribute-packages:
simd: [ i686-linux, x86_64-linux, x86_64-darwin ]
simgi: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-actors: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ simple-affine-space: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8876,6 +8925,7 @@ dont-distribute-packages:
spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ]
spoty: [ i686-linux, x86_64-linux, x86_64-darwin ]
Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sprinkles: [ i686-linux, x86_64-linux, x86_64-darwin ]
spritz: [ i686-linux, x86_64-linux, x86_64-darwin ]
spsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
spy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8900,6 +8950,7 @@ dont-distribute-packages:
sssp: [ i686-linux, x86_64-linux, x86_64-darwin ]
sstable: [ i686-linux, x86_64-linux, x86_64-darwin ]
SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ st2: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8945,6 +8996,7 @@ dont-distribute-packages:
stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ statsdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
stb-image-redux: [ i686-linux, x86_64-linux, x86_64-darwin ]
stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ]
stdata: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9689,6 +9741,7 @@ dont-distribute-packages:
visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ]
vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ]
VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ voicebase: [ i686-linux, x86_64-linux, x86_64-darwin ]
vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ]
vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9700,6 +9753,7 @@ dont-distribute-packages:
vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ]
vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ waargonaut: [ i686-linux, x86_64-linux, x86_64-darwin ]
wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
waddle: [ i686-linux, x86_64-linux, x86_64-darwin ]
wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9817,6 +9871,7 @@ dont-distribute-packages:
winio: [ i686-linux, x86_64-linux, x86_64-darwin ]
wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
wiring: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ witty: [ i686-linux, x86_64-linux, x86_64-darwin ]
wkt-geom: [ i686-linux, x86_64-linux, x86_64-darwin ]
wkt: [ i686-linux, x86_64-linux, x86_64-darwin ]
wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9876,6 +9931,7 @@ dont-distribute-packages:
X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ]
X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ]
X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ]
xcb-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9967,10 +10023,15 @@ dont-distribute-packages:
yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ]
yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ]
yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
yaop: [ i686-linux, x86_64-linux, x86_64-darwin ]
yap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10071,6 +10132,7 @@ dont-distribute-packages:
yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ]
yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yoda: [ i686-linux, x86_64-linux, x86_64-darwin ]
yoga: [ i686-linux, x86_64-linux, x86_64-darwin ]
Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ]
Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
deleted file mode 100644
index be90794f58d..00000000000
--- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_35;
-
- # Disable GHC 8.0.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # cabal-install can use the native Cabal library.
- cabal-install = super.cabal-install.override { Cabal = null; };
-
- # jailbreak-cabal can use the native Cabal library.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
-
- # https://github.com/bmillwood/applicative-quoters/issues/6
- applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
- sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
- });
-
- # https://github.com/christian-marie/xxhash/issues/3
- xxhash = doJailbreak super.xxhash;
-
- # https://github.com/Deewiant/glob/issues/8
- Glob = doJailbreak super.Glob;
-
- # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
- vector-algorithms = dontCheck super.vector-algorithms;
-
-}
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8f230c92aaa..a0bf655a67b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -443,6 +443,7 @@ stdenv.mkDerivation ({
env = shellFor {
packages = p: [ drv ];
+ inherit shellHook;
};
};
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fd19a506d15..7fd4df278f1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -766,6 +766,50 @@ self: {
maintainers = with stdenv.lib.maintainers; [ abbradar ];
}) {inherit (pkgs) emacs;};
+ "Agda_2_5_4_2" = callPackage
+ ({ mkDerivation, alex, array, async, base, binary, blaze-html
+ , boxes, bytestring, Cabal, containers, data-hash, deepseq
+ , directory, EdisonCore, edit-distance, emacs, equivalence
+ , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
+ , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
+ , regex-tdfa, stm, strict, template-haskell, text, time
+ , transformers, unordered-containers, uri-encode, zlib
+ }:
+ mkDerivation {
+ pname = "Agda";
+ version = "2.5.4.2";
+ sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal filemanip filepath process ];
+ libraryHaskellDepends = [
+ array async base binary blaze-html boxes bytestring containers
+ data-hash deepseq directory EdisonCore edit-distance equivalence
+ filepath geniplate-mirror gitrev hashable hashtables haskeline
+ ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+ template-haskell text time transformers unordered-containers
+ uri-encode zlib
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [ base directory filepath process ];
+ executableToolDepends = [ emacs ];
+ postInstall = ''
+ files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+ for f in "''${files[@]}" ; do
+ $out/bin/agda $f
+ done
+ for f in "''${files[@]}" ; do
+ $out/bin/agda -c --no-main $f
+ done
+ $out/bin/agda-mode compile
+ '';
+ description = "A dependently typed functional programming language and proof assistant";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ abbradar ];
+ }) {inherit (pkgs) emacs;};
+
"Agda-executable" = callPackage
({ mkDerivation, Agda, base }:
mkDerivation {
@@ -1185,8 +1229,8 @@ self: {
}:
mkDerivation {
pname = "BNFC";
- version = "2.8.1";
- sha256 = "082r1arj76563q1grc9ivpzfip8ghdffm87fj4q830s40dffl6rc";
+ version = "2.8.2";
+ sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base ];
@@ -8951,10 +8995,8 @@ self: {
}:
mkDerivation {
pname = "HaXml";
- version = "1.25.4";
- sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
- revision = "1";
- editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
+ version = "1.25.5";
+ sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10226,8 +10268,8 @@ self: {
({ mkDerivation, base, mtl, QuickCheck, Stream }:
mkDerivation {
pname = "IOSpec";
- version = "0.3";
- sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
+ version = "0.3.1";
+ sha256 = "1xfhsj8r2gf9wynsihls255qqwqj8vrjyn56rk60xvm27ya4f1d3";
libraryHaskellDepends = [ base mtl QuickCheck Stream ];
description = "A pure specification of the IO monad";
license = stdenv.lib.licenses.bsd3;
@@ -12274,10 +12316,8 @@ self: {
}:
mkDerivation {
pname = "MiniAgda";
- version = "0.2017.2.18";
- sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw";
- revision = "1";
- editedCabalFile = "0n4sd1b0c9fmgn7xqbhbms6y3ffkdgpa4fw7xcx31vgql2adxb0n";
+ version = "0.2018.11.4";
+ sha256 = "179f7kf355bkmpz1xjlf072axwsixjafh77m0anqx6q3g7qd0b36";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -12290,7 +12330,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "MissingH" = callPackage
+ "MissingH_1_4_0_1" = callPackage
({ mkDerivation, array, base, containers, directory
, errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
, old-locale, old-time, parsec, process, QuickCheck, random
@@ -12313,9 +12353,10 @@ self: {
];
description = "Large utility library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "MissingH_1_4_1_0" = callPackage
+ "MissingH" = callPackage
({ mkDerivation, array, base, containers, directory
, errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
, old-locale, old-time, parsec, process, QuickCheck, random
@@ -12336,7 +12377,6 @@ self: {
];
description = "Large utility library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"MissingK" = callPackage
@@ -15097,12 +15137,12 @@ self: {
}) {};
"QuickCheck-safe" = callPackage
- ({ mkDerivation, base, QuickCheck }:
+ ({ mkDerivation, base, containers, QuickCheck }:
mkDerivation {
pname = "QuickCheck-safe";
- version = "0.1.0.4";
- sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7";
- libraryHaskellDepends = [ base QuickCheck ];
+ version = "0.1.0.5";
+ sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l";
+ libraryHaskellDepends = [ base containers QuickCheck ];
description = "Safe reimplementation of QuickCheck's core";
license = stdenv.lib.licenses.mit;
}) {};
@@ -18676,8 +18716,8 @@ self: {
}:
mkDerivation {
pname = "Villefort";
- version = "0.1.2.14";
- sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg";
+ version = "0.1.2.17";
+ sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -18687,7 +18727,7 @@ self: {
transformers unix uri-encode
];
executableHaskellDepends = [
- base HDBC HDBC-sqlite3 random scotty split text time
+ base HDBC HDBC-sqlite3 mtl random scotty split text time
];
testHaskellDepends = [
base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck
@@ -19631,17 +19671,20 @@ self: {
}) {};
"Yampa" = callPackage
- ({ mkDerivation, base, deepseq, random }:
+ ({ mkDerivation, base, deepseq, random, simple-affine-space }:
mkDerivation {
pname = "Yampa";
- version = "0.11.1";
- sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
+ version = "0.13";
+ sha256 = "1rxy8vky3wmqn4awr6v7r40ghk6nr27y11jnzbkj1bdp1948irc0";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base deepseq random ];
+ libraryHaskellDepends = [
+ base deepseq random simple-affine-space
+ ];
testHaskellDepends = [ base ];
- description = "Library for programming hybrid systems";
+ description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Yampa-core" = callPackage
@@ -19673,6 +19716,7 @@ self: {
];
description = "Software synthesizer";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Yocto" = callPackage
@@ -22193,8 +22237,8 @@ self: {
}:
mkDerivation {
pname = "aeson-schema";
- version = "0.4.1.2";
- sha256 = "1afw0kf39myh4yqkkz8z1a7ji02j2iy7j66ch06pglvp5hzyi9dk";
+ version = "0.4.1.3";
+ sha256 = "17w0hih9l7x9r14s2mxywjzysm00f6bz6rqsgknvv9injakpscn3";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson attoparsec base bytestring containers fail ghc-prim mtl
@@ -23137,17 +23181,6 @@ self: {
}) {};
"alg" = callPackage
- ({ mkDerivation, base, util }:
- mkDerivation {
- pname = "alg";
- version = "0.2.7.0";
- sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6";
- libraryHaskellDepends = [ base util ];
- description = "Algebraic structures";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "alg_0_2_8_0" = callPackage
({ mkDerivation, base, util }:
mkDerivation {
pname = "alg";
@@ -23156,7 +23189,6 @@ self: {
libraryHaskellDepends = [ base util ];
description = "Algebraic structures";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"alga" = callPackage
@@ -26914,8 +26946,8 @@ self: {
pname = "ansi-pretty";
version = "0.1.2.1";
sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
- revision = "5";
- editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi";
+ revision = "6";
+ editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base bytestring containers generics-sop
nats scientific semigroups tagged text time unordered-containers
@@ -26929,8 +26961,8 @@ self: {
({ mkDerivation, base, colour }:
mkDerivation {
pname = "ansi-terminal";
- version = "0.8.1";
- sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy";
+ version = "0.8.2";
+ sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base colour ];
@@ -27093,8 +27125,8 @@ self: {
}:
mkDerivation {
pname = "antiope-athena";
- version = "6.1.1";
- sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21";
+ version = "6.1.2";
+ sha256 = "0af1sd3hhi2j2bsglqi5vqs7cjh719zbzkjcxi68sy4h3783vqc2";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -27110,8 +27142,8 @@ self: {
({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
mkDerivation {
pname = "antiope-contract";
- version = "6.1.1";
- sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz";
+ version = "6.1.2";
+ sha256 = "1s9xikffc3l6q7l2fmi5yz6shw90w8zgb8sc1s3d85z7kfsi87rp";
libraryHaskellDepends = [
aeson antiope-s3 avro base bytestring text
];
@@ -27126,8 +27158,8 @@ self: {
}:
mkDerivation {
pname = "antiope-core";
- version = "6.1.1";
- sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py";
+ version = "6.1.2";
+ sha256 = "0bn975bcr1fm8w63m641iip22hw5alam28z73p3cjcx9wkzkfca4";
libraryHaskellDepends = [
amazonka amazonka-core base bytestring generic-lens http-client
lens monad-logger mtl resourcet transformers unliftio-core
@@ -27147,8 +27179,8 @@ self: {
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "6.1.1";
- sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly";
+ version = "6.1.2";
+ sha256 = "04ik6ms66yiq934dqhadw4fhb5js08q6czpgb8vqsv8pvm3cj30f";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -27168,8 +27200,8 @@ self: {
}:
mkDerivation {
pname = "antiope-messages";
- version = "6.1.1";
- sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13";
+ version = "6.1.2";
+ sha256 = "1vkjflqi2k4d74hwagfaff4gyjx5809d2yjijhmgwk5aldyydw9m";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27193,8 +27225,8 @@ self: {
}:
mkDerivation {
pname = "antiope-s3";
- version = "6.1.1";
- sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7";
+ version = "6.1.2";
+ sha256 = "1lrawihlnl1kmhqimcf59d7a2ad916ss83zjllx3x8cy6br68b4r";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-s3 antiope-core base bytestring
conduit conduit-extra exceptions generic-lens http-types lens
@@ -27216,8 +27248,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sns";
- version = "6.1.1";
- sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7";
+ version = "6.1.2";
+ sha256 = "0b6blhcc1dplc16v9k12jn9s9ii5575sj9hm4kbla8483j24rd3k";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sns base generic-lens lens
text unliftio-core
@@ -27237,8 +27269,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sqs";
- version = "6.1.1";
- sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r";
+ version = "6.1.2";
+ sha256 = "1d508kcsm1bxz768fxin5jc6y7jqskdxxpgl1z5n1579aq7wb0ia";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27369,7 +27401,7 @@ self: {
description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {libaosd = null;};
+ }) {inherit (pkgs) libaosd;};
"ap-reflect" = callPackage
({ mkDerivation, base }:
@@ -28999,6 +29031,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "arraylist" = callPackage
+ ({ mkDerivation, base, hashable, initialize, MonadRandom, primitive
+ , smallcheck, tasty, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "arraylist";
+ version = "0.1.0.0";
+ sha256 = "1swvn9k7j2pwcln4znzrszgwgdi4f26q9qlaz2fi8jixc089v91g";
+ libraryHaskellDepends = [ base initialize primitive ];
+ testHaskellDepends = [
+ base hashable MonadRandom primitive smallcheck tasty
+ tasty-smallcheck
+ ];
+ description = "Memory-efficient ArrayList implementation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"arrow-extras" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -29161,8 +29211,8 @@ self: {
}:
mkDerivation {
pname = "ascii";
- version = "0.0.5.1";
- sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn";
+ version = "0.0.5.2";
+ sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby";
libraryHaskellDepends = [
base blaze-builder bytestring case-insensitive hashable semigroups
text
@@ -29607,8 +29657,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "asset-bundle";
- version = "0.1.0.0";
- sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86";
+ version = "0.1.0.1";
+ sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw";
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A build-time Cabal library that bundles executables with assets";
license = stdenv.lib.licenses.bsd3;
@@ -29677,8 +29727,8 @@ self: {
pname = "ast-monad";
version = "0.1.0.0";
sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
- revision = "3";
- editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7";
+ revision = "4";
+ editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A library for constructing AST by using do-notation";
@@ -30384,16 +30434,16 @@ self: {
"ats-pkg" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
- , Cabal, cli-setup, composition-prelude, containers, cpphs
- , dependency, dhall, directory, file-embed, filemanip, filepath
- , http-client, http-client-tls, lzma, microlens, mtl
- , optparse-applicative, parallel-io, process, shake, shake-ats
- , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
+ , Cabal, cli-setup, composition-prelude, containers, dependency
+ , dhall, directory, file-embed, filemanip, filepath, http-client
+ , http-client-tls, lzma, microlens, mtl, optparse-applicative
+ , parallel-io, process, shake, shake-ats, shake-c, shake-ext, tar
+ , temporary, text, unix, zip-archive, zlib
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.2.3";
- sha256 = "111lwv4461ij5z8z9n0kyvqcrjk0x5yjajfc3wyc3lklgc6ccjva";
+ version = "3.2.4.0";
+ sha256 = "0pj7zyf38rbi48lh8jhcm54wrflkdyh1583d9h4iy9nj5apa85ip";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -30404,7 +30454,6 @@ self: {
microlens mtl parallel-io process shake shake-ats shake-c shake-ext
tar text unix zip-archive zlib
];
- libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
base bytestring cli-setup dependency directory microlens
optparse-applicative parallel-io shake shake-ats temporary text
@@ -31417,20 +31466,18 @@ self: {
"avers-server" = callPackage
({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
, bytestring, bytestring-conversion, containers, cookie, cryptonite
- , http-types, memory, mtl, resource-pool, rethinkdb-client-driver
- , servant, servant-server, stm, text, time, transformers, wai
- , wai-websockets, websockets
+ , http-types, memory, mtl, resource-pool, servant, servant-server
+ , stm, text, time, transformers, wai, wai-websockets, websockets
}:
mkDerivation {
pname = "avers-server";
- version = "0.1.0";
- sha256 = "0m809p50l1bfhnmbwl3ncav8lz7xh38yakqa35z65afb6k1g900z";
+ version = "0.1.0.1";
+ sha256 = "13jic248m2307r84acv4b4xlh7pvx4kxm6gp0nhvz1ds0bbrdkdy";
libraryHaskellDepends = [
aeson avers avers-api base base64-bytestring bytestring
bytestring-conversion containers cookie cryptonite http-types
- memory mtl resource-pool rethinkdb-client-driver servant
- servant-server stm text time transformers wai wai-websockets
- websockets
+ memory mtl resource-pool servant servant-server stm text time
+ transformers wai wai-websockets websockets
];
description = "Server implementation of the Avers API";
license = stdenv.lib.licenses.mit;
@@ -31519,7 +31566,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "avro_0_3_6_1" = callPackage
+ "avro_0_4_0_0" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, binary
, bytestring, containers, data-binary-ieee754, directory, entropy
, extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
@@ -31528,8 +31575,8 @@ self: {
}:
mkDerivation {
pname = "avro";
- version = "0.3.6.1";
- sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3";
+ version = "0.4.0.0";
+ sha256 = "1cly3x4lmibcjm5sz68s2fncakpx2cfvyimv4ck1mm5v94yfp8pi";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -32263,25 +32310,22 @@ self: {
}:
mkDerivation {
pname = "axel";
- version = "0.0.6";
- sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh";
- revision = "2";
- editedCabalFile = "12m24klalqxpglh9slhr65sxqd4dsqcaz2abmw29cki0cz6x29dp";
+ version = "0.0.8";
+ sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring directory filepath freer-simple haskell-src-exts
lens lens-aeson optparse-applicative parsec process regex-pcre
- singletons strict text typed-process vector yaml
+ singletons strict template-haskell text typed-process vector yaml
];
executableHaskellDepends = [
base freer-simple optparse-applicative
];
testHaskellDepends = [
base bytestring filepath freer-simple hedgehog lens split tasty
- tasty-discover tasty-golden tasty-hedgehog tasty-hspec
- template-haskell transformers
+ tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers
];
testToolDepends = [ tasty-discover ];
description = "The Axel programming language";
@@ -32434,17 +32478,16 @@ self: {
({ mkDerivation, base, binary, bytestring, containers, criterion
, directory, errors, exceptions, filepath, lens, mmap, mtl, pipes
, pipes-interleave, QuickCheck, tasty, tasty-quickcheck
- , transformers, vector
+ , transformers, vector, vector-binary-instances
}:
mkDerivation {
pname = "b-tree";
- version = "0.1.3";
- sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
- revision = "2";
- editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
+ version = "0.1.4";
+ sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg";
libraryHaskellDepends = [
base binary bytestring containers directory errors exceptions
filepath lens mmap mtl pipes pipes-interleave transformers vector
+ vector-binary-instances
];
testHaskellDepends = [
base binary containers pipes QuickCheck tasty tasty-quickcheck
@@ -33029,17 +33072,6 @@ self: {
}) {invalid-cabal-flag-settings = null;};
"base-compat" = callPackage
- ({ mkDerivation, base, unix }:
- mkDerivation {
- pname = "base-compat";
- version = "0.10.4";
- sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
- libraryHaskellDepends = [ base unix ];
- description = "A compatibility layer for base";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "base-compat_0_10_5" = callPackage
({ mkDerivation, base, unix }:
mkDerivation {
pname = "base-compat";
@@ -33048,7 +33080,6 @@ self: {
libraryHaskellDepends = [ base unix ];
description = "A compatibility layer for base";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-compat-batteries" = callPackage
@@ -33094,6 +33125,7 @@ self: {
doHaddock = false;
description = "Helps migrating projects to base-compat(-batteries)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-encoding" = callPackage
@@ -33532,6 +33564,8 @@ self: {
pname = "basic-sop";
version = "0.2.0.2";
sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7";
+ revision = "1";
+ editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv";
libraryHaskellDepends = [
base deepseq generics-sop QuickCheck text
];
@@ -33755,6 +33789,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "bazel-runfiles" = callPackage
+ ({ mkDerivation, base, directory, filepath }:
+ mkDerivation {
+ pname = "bazel-runfiles";
+ version = "0.7.0.1";
+ sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base filepath ];
+ description = "Locate Bazel runfiles location";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"bbdb" = callPackage
({ mkDerivation, base, hspec, parsec }:
mkDerivation {
@@ -34074,13 +34122,14 @@ self: {
({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
mkDerivation {
pname = "bearriver";
- version = "0.10.4.3";
- sha256 = "0d8yhccsg66163cjkdccdjf26rkzv4i7fv454fj9vhylxcggzjin";
+ version = "0.10.4.4";
+ sha256 = "14aqp6jqca5b4z0bf5q18pq5l9q43bzz18zjwn3j0ns1fakrq5bb";
libraryHaskellDepends = [
base dunai MonadRandom mtl transformers
];
description = "A replacement of Yampa based on Monadic Stream Functions";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"beautifHOL" = callPackage
@@ -34098,20 +34147,18 @@ self: {
}) {};
"bed-and-breakfast" = callPackage
- ({ mkDerivation, array, base, binary, deepseq, QuickCheck
+ ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
, template-haskell
}:
mkDerivation {
pname = "bed-and-breakfast";
- version = "0.4.3";
- sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
- revision = "1";
- editedCabalFile = "0kqdmq6y2fgbknx2lsn1jx2g2n7yizdpzn6wvnnvjaqi945yvyry";
+ version = "0.5";
+ sha256 = "0dj1vvb9j55psp6yra72wk0k3k6ggvarmzj7zjgr8z3npv5mqmar";
libraryHaskellDepends = [
- array base binary deepseq template-haskell
+ array base binary cpphs deepseq template-haskell
];
testHaskellDepends = [ base QuickCheck ];
- description = "Efficient Matrix operations in 100% Haskell";
+ description = "Efficient Matrix and Vector operations in 100% Haskell";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -34234,8 +34281,8 @@ self: {
}:
mkDerivation {
pname = "bench-show";
- version = "0.2.0";
- sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65";
+ version = "0.2.2";
+ sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4";
libraryHaskellDepends = [
ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
mwc-random split statistics transformers vector
@@ -34925,27 +34972,6 @@ self: {
}) {};
"binary-conduit" = callPackage
- ({ mkDerivation, base, binary, bytestring, conduit, exceptions
- , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
- }:
- mkDerivation {
- pname = "binary-conduit";
- version = "1.3";
- sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3";
- revision = "1";
- editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx";
- libraryHaskellDepends = [
- base binary bytestring conduit exceptions vector
- ];
- testHaskellDepends = [
- base binary bytestring conduit hspec QuickCheck
- quickcheck-assertions resourcet
- ];
- description = "data serialization/deserialization conduit library";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "binary-conduit_1_3_1" = callPackage
({ mkDerivation, base, binary, bytestring, conduit, exceptions
, hspec, QuickCheck, quickcheck-assertions, resourcet, vector
}:
@@ -34962,7 +34988,6 @@ self: {
];
description = "data serialization/deserialization conduit library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"binary-derive" = callPackage
@@ -35317,6 +35342,8 @@ self: {
pname = "binary-tagged";
version = "0.1.5.1";
sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh";
+ revision = "1";
+ editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
generics-sop hashable scientific SHA tagged text time
@@ -37204,6 +37231,8 @@ self: {
pname = "bitwise";
version = "1.0.0.1";
sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
+ revision = "1";
+ editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs";
libraryHaskellDepends = [ array base bytestring ];
testHaskellDepends = [ base QuickCheck ];
benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -37235,13 +37264,15 @@ self: {
}) {};
"bizzlelude" = callPackage
- ({ mkDerivation, base-noprelude, containers, directory, text }:
+ ({ mkDerivation, base-noprelude, containers, directory, regexpr
+ , text
+ }:
mkDerivation {
pname = "bizzlelude";
- version = "1.2.0";
- sha256 = "1yqp46blrllx5irn1vvvx1v2n06pdfdfmhcng8hvs7q43fcsfgcr";
+ version = "1.5.0";
+ sha256 = "1mjy5hlszj85wvxwr7fza5wa004xjcg434kwzxzjmmlcvkgh2ybr";
libraryHaskellDepends = [
- base-noprelude containers directory text
+ base-noprelude containers directory regexpr text
];
description = "A lousy Prelude replacement by a lousy dude";
license = stdenv.lib.licenses.bsd3;
@@ -38847,8 +38878,8 @@ self: {
pname = "boring";
version = "0.1";
sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk";
- revision = "1";
- editedCabalFile = "0hdvr4rkkj2mapqha335rhncfmrw70qzjmfis2w9l4iqx617fv9m";
+ revision = "2";
+ editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci";
libraryHaskellDepends = [
adjunctions base base-compat constraints fin generics-sop streams
tagged transformers transformers-compat vec
@@ -39277,6 +39308,8 @@ self: {
pname = "brick";
version = "0.41.2";
sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix";
+ revision = "1";
+ editedCabalFile = "00z07bkarxqv517aq95gib864z9mrq9j86zh6jdxybf2v4fwh04s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -39867,6 +39900,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "btrfs_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, time, unix }:
+ mkDerivation {
+ pname = "btrfs";
+ version = "0.2.0.0";
+ sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring time unix ];
+ description = "Bindings to the btrfs API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"buchhaltung" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes
, bytestring, cassava, containers, data-default, Decimal, deepseq
@@ -41472,8 +41519,8 @@ self: {
}:
mkDerivation {
pname = "cabal-debian";
- version = "4.38.1";
- sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n";
+ version = "4.38.2";
+ sha256 = "1hr2y1jymi835pwm17z4fc0r58fkx3h8vxb03qp4fiadily0lg3s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41935,17 +41982,18 @@ self: {
"cabal-rpm" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , http-client, http-client-tls, http-conduit, process, time, unix
+ , http-client, http-client-tls, http-conduit, process, simple-cmd
+ , time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.12.5";
- sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa";
+ version = "0.12.6";
+ sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring Cabal directory filepath http-client
- http-client-tls http-conduit process time unix
+ http-client-tls http-conduit process simple-cmd time unix
];
description = "RPM packaging tool for Haskell Cabal-based packages";
license = stdenv.lib.licenses.gpl3;
@@ -42085,10 +42133,8 @@ self: {
({ mkDerivation, base, Cabal, QuickCheck }:
mkDerivation {
pname = "cabal-test-quickcheck";
- version = "0.1.8.1";
- sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn";
- revision = "1";
- editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6";
+ version = "0.1.8.2";
+ sha256 = "04fdfxvgp518x7n6d74l92qh67z94pay4wldy8dv4n51zhkgk8bf";
libraryHaskellDepends = [ base Cabal QuickCheck ];
description = "QuickCheck for Cabal";
license = stdenv.lib.licenses.mit;
@@ -42578,10 +42624,8 @@ self: {
}:
mkDerivation {
pname = "cacophony";
- version = "0.10.0";
- sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
- revision = "2";
- editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw";
+ version = "0.10.1";
+ sha256 = "1w9v04mdyzvwndqfb8my9a82b51avgwfnl6g7w89xj37ax9ariaj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43037,6 +43081,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "canonical-json" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, parsec
+ , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "canonical-json";
+ version = "0.5.0.1";
+ sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj";
+ libraryHaskellDepends = [
+ base bytestring containers parsec pretty
+ ];
+ testHaskellDepends = [
+ aeson base bytestring QuickCheck tasty tasty-quickcheck
+ unordered-containers vector
+ ];
+ description = "Canonical JSON for signing and hashing JSON values";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"canteven-config" = callPackage
({ mkDerivation, base, unix, yaml }:
mkDerivation {
@@ -43248,6 +43313,8 @@ self: {
pname = "capnp";
version = "0.3.0.0";
sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
+ revision = "1";
+ editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -46622,8 +46689,8 @@ self: {
({ mkDerivation, base, criterion, QuickCheck, random }:
mkDerivation {
pname = "cl3";
- version = "1.0.0.3";
- sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj";
+ version = "1.0.0.4";
+ sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v";
libraryHaskellDepends = [ base random ];
testHaskellDepends = [ base QuickCheck ];
benchmarkHaskellDepends = [ base criterion ];
@@ -47282,8 +47349,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.24.0.7";
- sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy";
+ version = "0.24.0.8";
+ sha256 = "1csiak0i3aaz56f64509w49q4j21cb10zlxdx8lyhbm8aikva0n1";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
@@ -47454,8 +47521,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-page";
- version = "0.4.3.12";
- sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj";
+ version = "0.4.3.13";
+ sha256 = "0fkfsi9hv0hv4zbv2znb0v30z5qvifgmz9875868va0830nv3ibh";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
acid-state aeson attoparsec base clckwrks containers directory
@@ -47877,8 +47944,8 @@ self: {
}:
mkDerivation {
pname = "cloben";
- version = "0.1.0.3";
- sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2";
+ version = "0.1.1.0";
+ sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -48361,23 +48428,6 @@ self: {
}) {};
"cmark-gfm" = callPackage
- ({ mkDerivation, base, blaze-html, bytestring, cheapskate
- , criterion, discount, HUnit, markdown, sundown, text
- }:
- mkDerivation {
- pname = "cmark-gfm";
- version = "0.1.5";
- sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7";
- libraryHaskellDepends = [ base bytestring text ];
- testHaskellDepends = [ base HUnit text ];
- benchmarkHaskellDepends = [
- base blaze-html cheapskate criterion discount markdown sundown text
- ];
- description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cmark-gfm_0_1_6" = callPackage
({ mkDerivation, base, blaze-html, bytestring, cheapskate
, criterion, discount, HUnit, markdown, sundown, text
}:
@@ -48392,7 +48442,6 @@ self: {
];
description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cmark-highlight" = callPackage
@@ -49655,19 +49704,21 @@ self: {
}) {};
"combinat" = callPackage
- ({ mkDerivation, array, base, containers, QuickCheck, random
- , test-framework, test-framework-quickcheck2, transformers
+ ({ mkDerivation, array, base, containers, QuickCheck, random, tasty
+ , tasty-hunit, tasty-quickcheck, test-framework
+ , test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "combinat";
- version = "0.2.8.2";
- sha256 = "0i7hk8518ixwxvxgy9xbf9hcyfpvmcfgz5m3wbxzcj5ry4rnnhnh";
+ version = "0.2.9.0";
+ sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw";
libraryHaskellDepends = [
array base containers random transformers
];
testHaskellDepends = [
- array base containers QuickCheck random test-framework
- test-framework-quickcheck2 transformers
+ array base containers QuickCheck random tasty tasty-hunit
+ tasty-quickcheck test-framework test-framework-quickcheck2
+ transformers
];
description = "Generate and manipulate various combinatorial objects";
license = stdenv.lib.licenses.bsd3;
@@ -49794,19 +49845,21 @@ self: {
}) {};
"comfort-array" = callPackage
- ({ mkDerivation, base, guarded-allocation, QuickCheck, transformers
- , utility-ht
+ ({ mkDerivation, base, guarded-allocation, primitive, QuickCheck
+ , storable-record, transformers, utility-ht
}:
mkDerivation {
pname = "comfort-array";
- version = "0.1.1";
- sha256 = "0kmqb7mcanx3n597nm8p6g76nc4v5smkl5srjmb2757fb3w68xmk";
+ version = "0.1.2";
+ sha256 = "1rc8gfgjid10wajjk5pp1vmm8wc2apr5qcr2w41pwk25m554iyz1";
libraryHaskellDepends = [
- base guarded-allocation QuickCheck transformers utility-ht
+ base guarded-allocation primitive QuickCheck storable-record
+ transformers utility-ht
];
testHaskellDepends = [ base QuickCheck ];
description = "Arrays where the index type is a function of the shape type";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"comfort-graph" = callPackage
@@ -50256,8 +50309,8 @@ self: {
}:
mkDerivation {
pname = "compdata-fixplate";
- version = "0.1.2";
- sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz";
+ version = "0.1.3";
+ sha256 = "1b9xmp2lps9k9fvvpqlha0vkncs4pivixyyqs71zl4dxcrsa8ryx";
libraryHaskellDepends = [
base composition containers deriving-compat fixplate tree-view
];
@@ -50354,8 +50407,8 @@ self: {
pname = "complex-generic";
version = "0.1.1.1";
sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
- revision = "2";
- editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
+ revision = "3";
+ editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9";
libraryHaskellDepends = [ base template-haskell ];
description = "complex numbers with non-mandatory RealFloat";
license = stdenv.lib.licenses.bsd3;
@@ -50635,12 +50688,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "composition-prelude_2_0_0_0" = callPackage
+ "composition-prelude_2_0_1_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "2.0.0.0";
- sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5";
+ version = "2.0.1.0";
+ sha256 = "027fzappyma8hqqkqka21af937h57fdaq8ni73skxa03pcflwqmc";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
@@ -50877,8 +50930,8 @@ self: {
}:
mkDerivation {
pname = "concraft";
- version = "0.14.1";
- sha256 = "0v7han8ps1ysxi929clkbx0c0vjd6dyxxhfp8q5k2jx58blwzxyg";
+ version = "0.14.2";
+ sha256 = "151cp99iah0fd50fkizidcla7f1kvb0jwgl1cj3j6f25j21894dy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50924,8 +50977,8 @@ self: {
}:
mkDerivation {
pname = "concraft-pl";
- version = "2.1.1";
- sha256 = "1fznivcsgyjhb62jzk9a3wsv8rmynr7y7473ldbqypkjgy2rmvf2";
+ version = "2.4.0";
+ sha256 = "0gc50aadzryy1a8mj85i4afgip34w6pk4s2kqsn10910634lmy6h";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -51245,8 +51298,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "concurrent-split";
- version = "0.0.1";
- sha256 = "1rxq0l513mldz7rlpmpac7n6mipk4lciv58h77h0zypixy73qyb0";
+ version = "0.0.1.1";
+ sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f";
libraryHaskellDepends = [ base ];
description = "MVars and Channels with distinguished input and output side";
license = stdenv.lib.licenses.bsd3;
@@ -51905,8 +51958,8 @@ self: {
}:
mkDerivation {
pname = "confcrypt";
- version = "0.1.0.2";
- sha256 = "0iw47xz34f2dljsq6hm75046sy7wmzj4ndgfh9h3x4iixs5vidfw";
+ version = "0.1.0.4";
+ sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -51929,6 +51982,7 @@ self: {
text transformers
];
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"confetti" = callPackage
@@ -52113,6 +52167,8 @@ self: {
pname = "config-value-getopt";
version = "0.1.1.0";
sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c";
+ revision = "1";
+ editedCabalFile = "1vdm5pgql8cggdkqxhc2z0cg2s7xayghdm51k0m3lx9396f5pxm8";
libraryHaskellDepends = [ base config-value text ];
description = "Interface between config-value and System.GetOpt";
license = stdenv.lib.licenses.mit;
@@ -52952,8 +53008,8 @@ self: {
({ mkDerivation, base, deepseq, primitive }:
mkDerivation {
pname = "contiguous";
- version = "0.3.0.0";
- sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28";
+ version = "0.3.1.0";
+ sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i";
libraryHaskellDepends = [ base deepseq primitive ];
description = "Unified interface for primitive arrays";
license = stdenv.lib.licenses.bsd3;
@@ -53141,24 +53197,6 @@ self: {
}) {};
"control-dsl" = callPackage
- ({ mkDerivation, base, containers, doctest, doctest-discover
- , temporary
- }:
- mkDerivation {
- pname = "control-dsl";
- version = "0.2.1.1";
- sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg";
- revision = "1";
- editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [
- base containers doctest doctest-discover temporary
- ];
- description = "An alternative to monads for control flow DSLs";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "control-dsl_0_2_1_3" = callPackage
({ mkDerivation, base, containers, doctest, doctest-discover
, temporary
}:
@@ -53172,7 +53210,6 @@ self: {
];
description = "An alternative to monads for control flow DSLs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"control-event" = callPackage
@@ -54395,7 +54432,7 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Bindings for libpython";
license = stdenv.lib.licenses.gpl3;
- }) {inherit (pkgs) python34;};
+ }) {python34 = null;};
"cql" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, Decimal
@@ -54852,8 +54889,8 @@ self: {
}:
mkDerivation {
pname = "creatur";
- version = "5.9.25";
- sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5";
+ version = "5.9.27";
+ sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c";
libraryHaskellDepends = [
array base binary bytestring cereal cond directory exceptions
filepath gray-extended hdaemonize hsyslog MonadRandom mtl random
@@ -54963,8 +55000,8 @@ self: {
}:
mkDerivation {
pname = "crf-chain1-constrained";
- version = "0.5.0";
- sha256 = "194mcafkf23lifmx2n2hnvsaxl0mfdl9zgl9awigddwxvpxsrmjq";
+ version = "0.6.0";
+ sha256 = "0yzwvzknn0qd8d2b0fqk1lznz8fplv6gx8x5hlmhqmi2f625yav7";
libraryHaskellDepends = [
array base binary containers data-lens data-memocombinators
logfloat monad-codec parallel pedestrian-dag random sgd vector
@@ -55000,8 +55037,8 @@ self: {
}:
mkDerivation {
pname = "crf-chain2-tiers";
- version = "0.5.0";
- sha256 = "1gwfkvs9lc7ni68n2mxrqx0haawnc8dwx0b73q7a75ysx538f84x";
+ version = "0.6.0";
+ sha256 = "14vn96vq7ck9xs1gnjmsxi6hr8mlpa6vbr53v2v4lmbav29jqrhr";
libraryHaskellDepends = [
array base binary comonad containers data-lens data-memocombinators
logfloat monad-codec parallel pedestrian-dag sgd vector
@@ -55482,20 +55519,6 @@ self: {
}) {};
"crypto-enigma" = callPackage
- ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
- , split
- }:
- mkDerivation {
- pname = "crypto-enigma";
- version = "0.0.2.13";
- sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl";
- libraryHaskellDepends = [ base containers MissingH mtl split ];
- testHaskellDepends = [ base HUnit QuickCheck ];
- description = "An Enigma machine simulator with display";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "crypto-enigma_0_0_2_14" = callPackage
({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
, split
}:
@@ -55507,7 +55530,6 @@ self: {
testHaskellDepends = [ base HUnit QuickCheck ];
description = "An Enigma machine simulator with display";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"crypto-multihash" = callPackage
@@ -56616,6 +56638,30 @@ self: {
executableHaskellDepends = [ base GLUT Yampa ];
description = "3D Yampa/GLUT Puzzle Game";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "cuckoo-filter" = callPackage
+ ({ mkDerivation, aeson, base, cereal, containers, criterion
+ , hashable, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "cuckoo-filter";
+ version = "0.1.0.2";
+ sha256 = "16ql9qvf1qsbnk1wxy3d5iqyk0kyx9w27vq284gr34yqd18dpvk5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ aeson base cereal containers hashable ];
+ executableHaskellDepends = [
+ aeson base cereal containers criterion hashable random
+ ];
+ testHaskellDepends = [
+ aeson base cereal containers hashable QuickCheck tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Pure and impure Cuckoo Filter";
+ license = stdenv.lib.licenses.mit;
}) {};
"cuda" = callPackage
@@ -57236,8 +57282,8 @@ self: {
({ mkDerivation, base, doctest, template-haskell }:
mkDerivation {
pname = "d10";
- version = "0.1.0.0";
- sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq";
+ version = "0.2.1.0";
+ sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base doctest ];
description = "Digits 0-9";
@@ -59381,15 +59427,15 @@ self: {
}) {};
"data-timeout" = callPackage
- ({ mkDerivation, base, data-textual, parsers, tagged, text-printer
- , transformers-base
+ ({ mkDerivation, base, data-textual, parsers, stm, tagged
+ , text-printer, transformers-base
}:
mkDerivation {
pname = "data-timeout";
- version = "0.3";
- sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
+ version = "0.3.1";
+ sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6";
libraryHaskellDepends = [
- base data-textual parsers tagged text-printer transformers-base
+ base data-textual parsers stm tagged text-printer transformers-base
];
description = "64-bit timeouts of nanosecond precision";
license = stdenv.lib.licenses.bsd3;
@@ -59410,8 +59456,8 @@ self: {
({ mkDerivation, base, pretty, syb }:
mkDerivation {
pname = "data-tree-print";
- version = "0.1.0.1";
- sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f";
+ version = "0.1.0.2";
+ sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
libraryHaskellDepends = [ base pretty syb ];
description = "Print Data instances as a nested tree";
license = stdenv.lib.licenses.bsd3;
@@ -60755,8 +60801,8 @@ self: {
({ mkDerivation, base, singletons }:
mkDerivation {
pname = "decidable";
- version = "0.1.2.0";
- sha256 = "1dgxkwdazqdlnc6pvqwkx531xajl4ygjm5315dz9ilacgbbl2qss";
+ version = "0.1.4.0";
+ sha256 = "07cw2jhvii3prsbczxpmq7g492wc89yxp77ivs01gp3bl7m25cky";
libraryHaskellDepends = [ base singletons ];
description = "Combinators for manipulating dependently-typed predicates";
license = stdenv.lib.licenses.bsd3;
@@ -61876,6 +61922,8 @@ self: {
pname = "deriving-compat";
version = "0.5.2";
sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
+ revision = "1";
+ editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell
th-abstraction transformers transformers-compat
@@ -61931,8 +61979,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "descrilo";
- version = "0.1.0.6";
- sha256 = "166x7j8q5wg8iq1bf2qz01ps0b1pbfgizsy1zfhjd98a3zl9fid2";
+ version = "0.1.0.7";
+ sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
libraryHaskellDepends = [ base ];
description = "Loads a list of items with fields";
license = stdenv.lib.licenses.gpl3;
@@ -62196,8 +62244,8 @@ self: {
}:
mkDerivation {
pname = "dfinity-radix-tree";
- version = "0.5.0";
- sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b";
+ version = "0.5.2";
+ sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -62507,21 +62555,6 @@ self: {
}) {};
"dhall-text" = callPackage
- ({ mkDerivation, base, dhall, optparse-applicative, text }:
- mkDerivation {
- pname = "dhall-text";
- version = "1.0.12";
- sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base dhall optparse-applicative text
- ];
- description = "Template text using Dhall";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "dhall-text_1_0_13" = callPackage
({ mkDerivation, base, dhall, optparse-applicative, text }:
mkDerivation {
pname = "dhall-text";
@@ -62534,7 +62567,6 @@ self: {
];
description = "Template text using Dhall";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall-to-cabal" = callPackage
@@ -64322,6 +64354,8 @@ self: {
pname = "discord-gateway";
version = "0.2.2";
sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy";
+ revision = "1";
+ editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5";
libraryHaskellDepends = [
aeson base discord-types hslogger transformers url websockets wuss
];
@@ -64377,6 +64411,8 @@ self: {
pname = "discord-rest";
version = "0.2.2";
sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3";
+ revision = "1";
+ editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11";
libraryHaskellDepends = [
aeson base bytestring comonad data-default discord-types hashable
hslogger http-client mtl req stm text time url
@@ -64394,6 +64430,8 @@ self: {
pname = "discord-types";
version = "0.2.2";
sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc";
+ revision = "1";
+ editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w";
libraryHaskellDepends = [
aeson base hashable text time transformers unordered-containers
vector
@@ -65554,8 +65592,8 @@ self: {
}:
mkDerivation {
pname = "dmcc";
- version = "1.0.0.1";
- sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+ version = "1.1.0.0";
+ sha256 = "1lrscg4b13wd4gnkg3nsl2ala851lk03p9jxmlxmf2hbf4cl6cnc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66109,6 +66147,58 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "docusign-base" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, http-media
+ , lens, servant, servant-client, text
+ }:
+ mkDerivation {
+ pname = "docusign-base";
+ version = "0.0.1";
+ sha256 = "1qh1g8nyj606x0vapv6m07dhm4s3g5z17g1i4wk5bj63vxvms528";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default http-media lens servant
+ servant-client text
+ ];
+ description = "Low-level bindings to the DocuSign API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "docusign-client" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , data-default, docusign-base, exceptions, http-client
+ , http-client-tls, http-types, servant-client, text, uuid
+ }:
+ mkDerivation {
+ pname = "docusign-client";
+ version = "0.0.1";
+ sha256 = "1vyb7n08vqjmc18adbs6ck01q5440a0r99ahb566v427mr9hcydg";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring data-default docusign-base
+ exceptions http-client http-client-tls http-types servant-client
+ text uuid
+ ];
+ description = "Client bindings for the DocuSign API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "docusign-example" = callPackage
+ ({ mkDerivation, base, bytestring, docusign-base, docusign-client
+ , exceptions, filepath, optparse-generic, text, uuid
+ }:
+ mkDerivation {
+ pname = "docusign-example";
+ version = "0.1.0.0";
+ sha256 = "0fhyzmgdjq5rds0p0gifwg6pfsq17yyhj4nwvi6zpgzmww4vya21";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring docusign-base docusign-client exceptions filepath
+ optparse-generic text uuid
+ ];
+ description = "DocuSign examples";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"docvim" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec
@@ -67208,8 +67298,8 @@ self: {
({ mkDerivation, base, text, xml-types }:
mkDerivation {
pname = "dtd-types";
- version = "0.3.0.1";
- sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
+ version = "0.4.0.0";
+ sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka";
libraryHaskellDepends = [ base text xml-types ];
description = "Basic types for representing XML DTDs";
license = stdenv.lib.licenses.bsd3;
@@ -67425,6 +67515,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dunai_0_5_1" = callPackage
+ ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "dunai";
+ version = "0.5.1";
+ sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997";
+ libraryHaskellDepends = [
+ base MonadRandom transformers transformers-base
+ ];
+ description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "dunai-core" = callPackage
+ ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "dunai-core";
+ version = "0.5.1.0";
+ sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz";
+ libraryHaskellDepends = [
+ base MonadRandom transformers transformers-base
+ ];
+ description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"duplo" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, base64-bytestring, bytestring, containers, directory
@@ -68121,8 +68240,8 @@ self: {
}:
mkDerivation {
pname = "easytest";
- version = "0.2";
- sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b";
+ version = "0.2.1";
+ sha256 = "0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i";
libraryHaskellDepends = [
async base call-stack containers mtl random stm text transformers
];
@@ -68890,6 +69009,7 @@ self: {
];
description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"either" = callPackage
@@ -69037,8 +69157,8 @@ self: {
pname = "ekg-core";
version = "0.1.1.4";
sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
- revision = "2";
- editedCabalFile = "1jky0jf6ajan5zmb46d6p4lv7293kc5gw1bcq5av733g10cwrbdk";
+ revision = "3";
+ editedCabalFile = "1s3545x9w01rrwzchb4f91ck0n6dc7gf0zwkryqx1b2c95ni5qa8";
libraryHaskellDepends = [
base containers ghc-prim text unordered-containers
];
@@ -69856,22 +69976,6 @@ self: {
}) {};
"email-validate" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
- , QuickCheck, template-haskell
- }:
- mkDerivation {
- pname = "email-validate";
- version = "2.3.2.7";
- sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3";
- libraryHaskellDepends = [
- attoparsec base bytestring template-haskell
- ];
- testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
- description = "Email address validation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "email-validate_2_3_2_8" = callPackage
({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
, QuickCheck, template-haskell
}:
@@ -69885,7 +69989,6 @@ self: {
testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
description = "Email address validation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"email-validate-json" = callPackage
@@ -70357,8 +70460,8 @@ self: {
}:
mkDerivation {
pname = "entwine";
- version = "0.0.1";
- sha256 = "08yy72lgc8cg12hbz51q06zx7fslhhnk0rjjszba8aj0qbrj8yr4";
+ version = "0.0.2";
+ sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
libraryHaskellDepends = [
async base containers exceptions monad-loops SafeSemaphore stm text
time transformers transformers-either
@@ -70393,6 +70496,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "enum-types" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "enum-types";
+ version = "0.1.0.0";
+ sha256 = "18qiq6nnnd1c5lkvjafsqd4ypa4xpmx99diq82dz5wy2h95ci2ri";
+ libraryHaskellDepends = [ base ];
+ description = "small enum types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"enumerable" = callPackage
({ mkDerivation, base, control-monad-omega, tagged }:
mkDerivation {
@@ -70636,6 +70750,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "envstatus" = callPackage
+ ({ mkDerivation, base, ConfigFile, mtl, parsec, process, PyF, tasty
+ , tasty-hspec, unix
+ }:
+ mkDerivation {
+ pname = "envstatus";
+ version = "1.0.2";
+ sha256 = "1wdvhlmqwzwxv0y3n8xhw5yjy158c7xgiyd0p2zhjghws2p1jvp5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base ConfigFile mtl parsec process unix
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base ConfigFile parsec PyF tasty tasty-hspec
+ ];
+ description = "Display efficiently the state of the local environment";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"envy" = callPackage
({ mkDerivation, base, bytestring, containers, hspec, mtl
, QuickCheck, quickcheck-instances, text, time, transformers
@@ -72662,13 +72798,14 @@ self: {
}:
mkDerivation {
pname = "exhaustive";
- version = "1.1.6";
- sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk";
+ version = "1.1.7";
+ sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
libraryHaskellDepends = [
base generics-sop template-haskell transformers
];
description = "Compile time checks that a computation considers producing data through all possible constructors";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exherbo-cabal" = callPackage
@@ -72967,8 +73104,8 @@ self: {
pname = "exp-extended";
version = "0.1.1.2";
sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
- revision = "2";
- editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
+ revision = "3";
+ editedCabalFile = "0gd1jwhhj5qjvfysvrm41zywx3cq6n131ym2x94z68cpswdmv0qn";
libraryHaskellDepends = [ base compensated log-domain ];
description = "floating point with extended exponent range";
license = stdenv.lib.licenses.bsd3;
@@ -73445,23 +73582,30 @@ self: {
}) {};
"extensible-effects-concurrent" = callPackage
- ({ mkDerivation, base, containers, data-default, deepseq, directory
- , extensible-effects, filepath, HUnit, lens, logging-effect
- , monad-control, mtl, parallel, process, QuickCheck, random, stm
- , tagged, tasty, tasty-discover, tasty-hunit, time, transformers
+ ({ mkDerivation, async, base, containers, data-default, deepseq
+ , directory, enclosed-exceptions, extensible-effects, filepath
+ , HUnit, lens, logging-effect, monad-control, mtl, parallel
+ , process, QuickCheck, random, stm, tagged, tasty, tasty-discover
+ , tasty-hunit, time, transformers
}:
mkDerivation {
pname = "extensible-effects-concurrent";
- version = "0.5.0.1";
- sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp";
+ version = "0.9.0";
+ sha256 = "0y6rf1whjwhrzkjw70sayl95lf8b6dhn5l9pxhwp05gnz3ll81ka";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- base containers data-default deepseq directory extensible-effects
- filepath lens logging-effect monad-control mtl parallel process
- QuickCheck random stm tagged time transformers
+ async base containers data-default deepseq directory
+ enclosed-exceptions extensible-effects filepath lens logging-effect
+ monad-control mtl parallel process QuickCheck random stm tagged
+ time transformers
+ ];
+ executableHaskellDepends = [
+ base data-default extensible-effects lens
];
testHaskellDepends = [
- base containers deepseq extensible-effects HUnit lens QuickCheck
- stm tasty tasty-discover tasty-hunit
+ base containers data-default deepseq extensible-effects HUnit lens
+ QuickCheck stm tasty tasty-discover tasty-hunit
];
testToolDepends = [ tasty-discover ];
description = "Message passing concurrency as extensible-effect";
@@ -73504,22 +73648,6 @@ self: {
}) {};
"extra" = callPackage
- ({ mkDerivation, base, clock, directory, filepath, process
- , QuickCheck, time, unix
- }:
- mkDerivation {
- pname = "extra";
- version = "1.6.12";
- sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz";
- libraryHaskellDepends = [
- base clock directory filepath process time unix
- ];
- testHaskellDepends = [ base directory filepath QuickCheck unix ];
- description = "Extra functions I use";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "extra_1_6_13" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
, QuickCheck, time, unix
}:
@@ -73533,7 +73661,6 @@ self: {
testHaskellDepends = [ base directory filepath QuickCheck unix ];
description = "Extra functions I use";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extract-dependencies" = callPackage
@@ -75299,8 +75426,8 @@ self: {
}:
mkDerivation {
pname = "fficxx";
- version = "0.5";
- sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy";
+ version = "0.5.0.1";
+ sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s";
libraryHaskellDepends = [
aeson aeson-pretty base bytestring Cabal containers data-default
directory either errors filepath hashable haskell-src-exts lens mtl
@@ -77426,21 +77553,21 @@ self: {
"fltkhs" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , mtl, parsec, text
+ , mtl, parsec, pkg-config, text, vector
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.4.5";
- sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic";
+ version = "0.6.0.0";
+ sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
- libraryHaskellDepends = [ base bytestring text ];
- libraryToolDepends = [ c2hs ];
+ libraryHaskellDepends = [ base bytestring text vector ];
+ libraryToolDepends = [ c2hs pkg-config ];
executableHaskellDepends = [ base directory filepath mtl parsec ];
description = "FLTK bindings";
license = stdenv.lib.licenses.mit;
- }) {};
+ }) {pkg-config = null;};
"fltkhs-demos" = callPackage
({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
@@ -77500,6 +77627,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fltkhs-themes" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, fltkhs, fontconfig
+ , load-font, text, vector
+ }:
+ mkDerivation {
+ pname = "fltkhs-themes";
+ version = "0.1.0.1";
+ sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base bytestring fltkhs load-font text vector
+ ];
+ librarySystemDepends = [ fontconfig ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) fontconfig;};
+
"fluent-logger" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cereal
, cereal-conduit, conduit, conduit-extra, containers, criterion
@@ -77691,8 +77836,8 @@ self: {
}:
mkDerivation {
pname = "fmt";
- version = "0.6";
- sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
+ version = "0.6.1";
+ sha256 = "1c6a0nrm90drs13s1hry9xs8j7dx37j21f7kllpx5s240nqy4c6c";
libraryHaskellDepends = [
base base64-bytestring bytestring containers formatting microlens
text time time-locale-compat
@@ -79027,8 +79172,8 @@ self: {
}:
mkDerivation {
pname = "free-algebras";
- version = "0.0.5.1";
- sha256 = "1h8966am7j0xdqq2vmfj2cyrzmkd70bs1kx9fpx1bgn1acdpg1xa";
+ version = "0.0.6.0";
+ sha256 = "1332awl3aps1zw537ym18jp1d5igwsnpk3acmrznks7vfsdr27as";
libraryHaskellDepends = [
base constraints containers data-fix dlist free groups
kan-extensions mtl natural-numbers transformers
@@ -79042,6 +79187,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "free-category" = callPackage
+ ({ mkDerivation, base, free-algebras }:
+ mkDerivation {
+ pname = "free-category";
+ version = "0.0.1.0";
+ sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg";
+ libraryHaskellDepends = [ base free-algebras ];
+ description = "Free category";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"free-concurrent" = callPackage
({ mkDerivation, base, type-aligned }:
mkDerivation {
@@ -79438,6 +79594,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "freer-simple_1_2_0_0" = callPackage
+ ({ mkDerivation, base, criterion, extensible-effects, free, mtl
+ , natural-transformation, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, transformers-base
+ }:
+ mkDerivation {
+ pname = "freer-simple";
+ version = "1.2.0.0";
+ sha256 = "1z0f0m03szzcy1s6msqdlaj266dq0bkkwlwcr7p28xv7lj6gxgdb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base natural-transformation template-haskell transformers-base
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base criterion extensible-effects free mtl
+ ];
+ description = "Implementation of a friendly effect system for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"freesect" = callPackage
({ mkDerivation, array, base, cpphs, directory, mtl, parallel
, pretty, random, syb
@@ -80636,6 +80818,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fused-effects" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
+ }:
+ mkDerivation {
+ pname = "fused-effects";
+ version = "0.1.1.0";
+ sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
+ libraryHaskellDepends = [ base deepseq MonadRandom random ];
+ testHaskellDepends = [ base doctest hspec ];
+ description = "A fast, flexible, fused effect system";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fusion" = callPackage
({ mkDerivation, base, directory, doctest, filepath, pipes-safe
, transformers, void
@@ -80651,6 +80846,62 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "futhark" = callPackage
+ ({ mkDerivation, aeson, alex, ansi-terminal, array, base
+ , bifunctors, binary, blaze-html, bytestring, containers
+ , data-binary-ieee754, directory, directory-tree, dlist, extra
+ , file-embed, filepath, free, gitrev, happy, haskeline, http-client
+ , http-client-tls, http-conduit, HUnit, language-c-quote
+ , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation
+ , parallel, parser-combinators, process, process-extras, QuickCheck
+ , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, text
+ , th-lift-instances, time, transformers, vector
+ , vector-binary-instances, versions, zip-archive, zlib
+ }:
+ mkDerivation {
+ pname = "futhark";
+ version = "0.7.4";
+ sha256 = "1qjcza0i0y6qalyim5kclz3x4lj667d4d4y2amk3sn4qbgaibajs";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal array base bifunctors binary blaze-html bytestring
+ containers data-binary-ieee754 directory directory-tree dlist extra
+ file-embed filepath free gitrev http-client http-client-tls
+ http-conduit language-c-quote mainland-pretty markdown megaparsec
+ mtl neat-interpolation parallel parser-combinators process
+ process-extras raw-strings-qq regex-tdfa srcloc template-haskell
+ text th-lift-instances time transformers vector
+ vector-binary-instances versions zip-archive zlib
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [
+ aeson ansi-terminal array base bifunctors binary blaze-html
+ bytestring containers data-binary-ieee754 directory directory-tree
+ dlist extra file-embed filepath free gitrev haskeline http-client
+ http-client-tls http-conduit language-c-quote mainland-pretty
+ markdown megaparsec mtl neat-interpolation parallel
+ parser-combinators process process-extras random raw-strings-qq
+ regex-tdfa srcloc template-haskell temporary text th-lift-instances
+ time transformers vector vector-binary-instances versions
+ zip-archive zlib
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base bifunctors binary blaze-html bytestring
+ containers data-binary-ieee754 directory directory-tree dlist extra
+ file-embed filepath free gitrev http-client http-client-tls
+ http-conduit HUnit language-c-quote mainland-pretty markdown
+ megaparsec mtl neat-interpolation parallel parser-combinators
+ process process-extras QuickCheck raw-strings-qq regex-tdfa srcloc
+ tasty tasty-hunit tasty-quickcheck template-haskell text
+ th-lift-instances time transformers vector vector-binary-instances
+ versions zip-archive zlib
+ ];
+ description = "An optimising compiler for a functional, array-oriented language";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"futun" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -81101,8 +81352,8 @@ self: {
}:
mkDerivation {
pname = "gauge";
- version = "0.2.3";
- sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
+ version = "0.2.4";
+ sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9";
libraryHaskellDepends = [
base basement deepseq directory process vector
];
@@ -82098,14 +82349,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop_0_4_0_1" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "generics-sop";
+ version = "0.4.0.1";
+ sha256 = "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw";
+ libraryHaskellDepends = [
+ base ghc-prim sop-core template-haskell
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq template-haskell
+ ];
+ description = "Generic Programming using True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-sop-lens" = callPackage
({ mkDerivation, base, generics-sop, lens }:
mkDerivation {
pname = "generics-sop-lens";
version = "0.1.2.1";
sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
- revision = "5";
- editedCabalFile = "1q6953xi46qvbknaq2j8x2zqmk2q1mmf8xczjyib3abxz0rp3608";
+ revision = "6";
+ editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw";
libraryHaskellDepends = [ base generics-sop lens ];
description = "Lenses for types in generics-sop";
license = stdenv.lib.licenses.bsd3;
@@ -82935,8 +83206,8 @@ self: {
}:
mkDerivation {
pname = "geos";
- version = "0.1.1.2";
- sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d";
+ version = "0.2.1";
+ sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9";
libraryHaskellDepends = [
base bytestring mtl transformers vector
];
@@ -83310,8 +83581,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.8.0";
- sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5";
+ version = "0.8.0.1";
+ sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -83394,15 +83665,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-exactprint_0_5_8_1" = callPackage
+ "ghc-exactprint_0_5_8_2" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
, silently, syb
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.5.8.1";
- sha256 = "1qjl137f4lpadkgdyfjnkkga8vqyw0x27plpyw57aqhc8qmcylhh";
+ version = "0.5.8.2";
+ sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -85033,6 +85304,24 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
+ "gi-gtk-hs_0_3_6_3" = callPackage
+ ({ mkDerivation, base, base-compat, containers, gi-gdk
+ , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtk-hs";
+ version = "0.3.6.3";
+ sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay";
+ libraryHaskellDepends = [
+ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
+ gi-gtk haskell-gi-base mtl text transformers
+ ];
+ description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gi-gtkosxapplication" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
, gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
@@ -85097,6 +85386,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome3) webkitgtk;};
+ "gi-javascriptcore_4_0_16" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+ , text, transformers, webkitgtk
+ }:
+ mkDerivation {
+ pname = "gi-javascriptcore";
+ version = "4.0.16";
+ sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z";
+ setupHaskellDepends = [ base Cabal haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ webkitgtk ];
+ doHaddock = false;
+ description = "JavaScriptCore bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs.gnome3) webkitgtk;};
+
"gi-notify" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -85446,6 +85756,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gingersnap" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
+ , postgresql-simple, resource-pool, snap-core, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "gingersnap";
+ version = "0.2.2.3";
+ sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq http-types postgresql-simple
+ resource-pool snap-core text transformers unordered-containers
+ ];
+ description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ginsu" = callPackage
({ mkDerivation, array, async, base, binary, bytestring, containers
, directory, hashable, hashtables, mtl, network, old-locale
@@ -85606,19 +85933,20 @@ self: {
, edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
, free, git, gnupg, hinotify, hslogger, http-client
, http-client-tls, http-conduit, http-types, IfElse, lsof, magic
- , memory, monad-control, monad-logger, mountpoints, mtl, network
- , network-info, network-multicast, network-uri, old-locale, openssh
- , optparse-applicative, perl, persistent, persistent-sqlite
- , persistent-template, process, QuickCheck, random, regex-tdfa
- , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split
- , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck
- , tasty-rerun, text, time, torrent, transformers, unix, unix-compat
- , unordered-containers, utf8-string, uuid, vector, wget, which
+ , memory, microlens, monad-control, monad-logger, mountpoints, mtl
+ , network, network-info, network-multicast, network-uri, old-locale
+ , openssh, optparse-applicative, perl, persistent
+ , persistent-sqlite, persistent-template, process, QuickCheck
+ , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+ , securemem, socks, split, stm, stm-chans, tagsoup, tasty
+ , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time, torrent
+ , transformers, unix, unix-compat, unordered-containers
+ , utf8-string, uuid, vector, wget, which
}:
mkDerivation {
pname = "git-annex";
- version = "6.20181011";
- sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf";
+ version = "7.20181031";
+ sha256 = "02h3c77mdlr4c6l7c14ai0i2kq8c7pawvsf33my449b1srviazlm";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -85637,7 +85965,7 @@ self: {
crypto-api cryptonite data-default DAV dbus directory
disk-free-space dlist edit-distance esqueleto exceptions fdo-notify
feed filepath free hinotify hslogger http-client http-client-tls
- http-conduit http-types IfElse magic memory monad-control
+ http-conduit http-types IfElse magic memory microlens monad-control
monad-logger mountpoints mtl network network-info network-multicast
network-uri old-locale optparse-applicative persistent
persistent-sqlite persistent-template process QuickCheck random
@@ -86019,8 +86347,8 @@ self: {
}:
mkDerivation {
pname = "githash";
- version = "0.1.1.0";
- sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0";
+ version = "0.1.2.0";
+ sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8";
libraryHaskellDepends = [
base bytestring directory filepath process template-haskell
];
@@ -87942,6 +88270,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "godot-haskell" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, c2hs
+ , casing, colour, containers, lens, linear, mtl, parsec, parsers
+ , stm, template-haskell, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "godot-haskell";
+ version = "0.1.0.0";
+ sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i";
+ revision = "3";
+ editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409";
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint base bytestring casing colour containers lens
+ linear mtl parsec parsers stm template-haskell text
+ unordered-containers vector
+ ];
+ libraryToolDepends = [ c2hs ];
+ doHaddock = false;
+ description = "Haskell bindings for the Godot game engine API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gofer-prelude" = callPackage
({ mkDerivation, base, ghc-prim }:
mkDerivation {
@@ -89420,8 +89771,8 @@ self: {
}:
mkDerivation {
pname = "google-maps-geocoding";
- version = "0.4.0.1";
- sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8";
+ version = "0.4.0.2";
+ sha256 = "0q5zack0lcmn8wsksdlmd0vch1lizia9h4sqax7ydx09is39jzxm";
libraryHaskellDepends = [
aeson base google-static-maps http-client servant servant-client
text
@@ -89547,8 +89898,8 @@ self: {
}:
mkDerivation {
pname = "google-static-maps";
- version = "0.5.0.2";
- sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi";
+ version = "0.5.0.3";
+ sha256 = "18c4s9nvpwv34djf7m2jq5mdpyjplp1hcxrfrp5cdyglk6j0j13b";
libraryHaskellDepends = [
aeson base base64-bytestring bytedump bytestring cryptonite
double-conversion http-client JuicyPixels memory network-uri
@@ -90683,8 +91034,8 @@ self: {
({ mkDerivation, base, containers, json, text }:
mkDerivation {
pname = "graphql-w-persistent";
- version = "0.1.0.3";
- sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din";
+ version = "0.1.0.7";
+ sha256 = "13fbx5vzg2fq9883hdf8djbc47lyia6n4sshwz3dhg5bjpni7l1x";
libraryHaskellDepends = [ base containers json text ];
description = "Haskell GraphQL query parser-interpreter-data processor";
license = stdenv.lib.licenses.isc;
@@ -91667,8 +92018,8 @@ self: {
}:
mkDerivation {
pname = "gssapi-wai";
- version = "0.1.2.2";
- sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s";
+ version = "0.1.2.3";
+ sha256 = "08c47zwy4wh1cga5l4brg7dm5nkl7xcsq2rvwdzvmzzxyfg3nnr7";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive gssapi
http-types vault wai wai-extra
@@ -92667,56 +93018,6 @@ self: {
}) {};
"hOpenPGP" = callPackage
- ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
- , base16-bytestring, base64-bytestring, bifunctors, binary
- , binary-conduit, bytestring, bzlib, conduit, conduit-extra
- , containers, criterion, crypto-cipher-types, cryptonite, errors
- , hashable, incremental-parser, ixset-typed, lens, memory
- , monad-loops, nettle, network, network-uri, newtype
- , openpgp-asciiarmor, prettyprinter, QuickCheck
- , quickcheck-instances, resourcet, semigroups, split, tasty
- , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
- , transformers, unliftio-core, unordered-containers, zlib
- }:
- mkDerivation {
- pname = "hOpenPGP";
- version = "2.7.3";
- sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8";
- libraryHaskellDepends = [
- aeson asn1-encoding attoparsec base base16-bytestring
- base64-bytestring bifunctors binary binary-conduit bytestring bzlib
- conduit conduit-extra containers crypto-cipher-types cryptonite
- errors hashable incremental-parser ixset-typed lens memory
- monad-loops nettle network-uri newtype openpgp-asciiarmor
- prettyprinter resourcet semigroups split text time
- time-locale-compat transformers unliftio-core unordered-containers
- zlib
- ];
- testHaskellDepends = [
- aeson asn1-encoding attoparsec base base16-bytestring bifunctors
- binary binary-conduit bytestring bzlib conduit conduit-extra
- containers crypto-cipher-types cryptonite errors hashable
- incremental-parser ixset-typed lens memory monad-loops nettle
- network network-uri newtype prettyprinter QuickCheck
- quickcheck-instances resourcet semigroups split tasty tasty-hunit
- tasty-quickcheck text time time-locale-compat transformers
- unliftio-core unordered-containers zlib
- ];
- benchmarkHaskellDepends = [
- aeson base base16-bytestring base64-bytestring bifunctors binary
- binary-conduit bytestring bzlib conduit conduit-extra containers
- criterion crypto-cipher-types cryptonite errors hashable
- incremental-parser ixset-typed lens memory monad-loops nettle
- network network-uri newtype openpgp-asciiarmor prettyprinter
- resourcet semigroups split text time time-locale-compat
- transformers unliftio-core unordered-containers zlib
- ];
- description = "native Haskell implementation of OpenPGP (RFC4880)";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "hOpenPGP_2_7_4_1" = callPackage
({ mkDerivation, aeson, asn1-encoding, attoparsec, base
, base16-bytestring, base64-bytestring, bifunctors, binary
, binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -93706,8 +94007,8 @@ self: {
}:
mkDerivation {
pname = "hackage-whatsnew";
- version = "0.1.1";
- sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr";
+ version = "0.1.2";
+ sha256 = "19nk01jqfirvr8c3wy6pacq32v5lzxi735r8i6d23d0vwjfmqxnk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -94168,8 +94469,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.13.0";
- sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg";
+ version = "1.15.0";
+ sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95566,56 +95867,32 @@ self: {
"hapistrano" = callPackage
({ mkDerivation, aeson, async, base, directory, filepath
, formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
+ , path-io, process, QuickCheck, stm, temporary, time, transformers
+ , yaml
}:
mkDerivation {
pname = "hapistrano";
- version = "0.3.6.0";
- sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2";
+ version = "0.3.7.0";
+ sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
+ aeson base filepath formatting gitrev mtl path process time
+ transformers
];
executableHaskellDepends = [
aeson async base formatting gitrev optparse-applicative path
path-io stm yaml
];
testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
+ base directory filepath hspec mtl path path-io process QuickCheck
+ temporary
];
description = "A deployment library for Haskell applications";
license = stdenv.lib.licenses.mit;
}) {};
- "hapistrano_0_3_6_1" = callPackage
- ({ mkDerivation, aeson, async, base, directory, filepath
- , formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.6.1";
- sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
- ];
- executableHaskellDepends = [
- aeson async base formatting gitrev optparse-applicative path
- path-io stm yaml
- ];
- testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
- ];
- description = "A deployment library for Haskell applications";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"happindicator" = callPackage
({ mkDerivation, array, base, bytestring, containers, glib, gtk
, gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -97721,8 +97998,8 @@ self: {
}:
mkDerivation {
pname = "haskell-dap";
- version = "0.0.8.0";
- sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf";
+ version = "0.0.9.0";
+ sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -97785,6 +98062,7 @@ self: {
testHaskellDepends = [ base eigen vector ];
description = "Some utility functions for haskell-eigen library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-exp-parser" = callPackage
@@ -98127,7 +98405,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_8_0_0" = callPackage
+ "haskell-lsp_0_8_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
, lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -98135,8 +98413,8 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.8.0.0";
- sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk";
+ version = "0.8.0.1";
+ sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -98195,15 +98473,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_8_0_0" = callPackage
+ "haskell-lsp-types_0_8_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, filepath
, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.8.0.0";
- sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n";
+ version = "0.8.0.1";
+ sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8";
libraryHaskellDepends = [
aeson base bytestring data-default filepath hashable lens
network-uri scientific text unordered-containers
@@ -98761,6 +99039,8 @@ self: {
pname = "haskell-src-meta";
version = "0.8.0.3";
sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
+ revision = "2";
+ editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c";
libraryHaskellDepends = [
base haskell-src-exts pretty syb template-haskell th-orphans
];
@@ -100022,8 +100302,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.9.2";
- sha256 = "1aiqhw7fk6h70ps5svbhhhk577ai0rqk6s4bm00ii4yhnbdrdk60";
+ version = "0.9.4";
+ sha256 = "1lwlbi5pw9wngmhk6dkyc05ahq1w1a0jxipkf9g5spq7ipfw4v6y";
libraryHaskellDepends = [
base bytestring cereal conduit conduit-extra data-default hashable
haskoin-core monad-logger mtl network nqe random resourcet
@@ -100085,31 +100365,34 @@ self: {
}) {};
"haskoin-store" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cereal, conduit
- , containers, directory, filepath, haskoin-core, haskoin-node
- , hspec, http-types, monad-logger, mtl, network, nqe
- , optparse-applicative, random, rocksdb-haskell, rocksdb-query
- , scotty, string-conversions, text, time, transformers, unliftio
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit
+ , containers, data-default, directory, filepath, hashable
+ , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl
+ , network, nqe, optparse-applicative, random, rocksdb-haskell
+ , rocksdb-query, scotty, string-conversions, text, time
+ , transformers, unliftio, unordered-containers
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.2.3";
- sha256 = "0ywfmqdwvw07gx4a413i0ffsgrq2gfjgpw8a6f78h6idiw69shkw";
+ version = "0.6.0";
+ sha256 = "1qzxx1rbwv792f96wcsqmbsshd6qf34fqj6byi17la51s900zr09";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring cereal conduit containers haskoin-core
- haskoin-node monad-logger mtl network nqe random rocksdb-haskell
- rocksdb-query string-conversions text time transformers unliftio
+ aeson base bytestring cereal conduit containers data-default
+ hashable haskoin-core haskoin-node monad-logger mtl network nqe
+ random rocksdb-haskell rocksdb-query string-conversions text time
+ transformers unliftio unordered-containers
];
executableHaskellDepends = [
- aeson base bytestring conduit directory filepath haskoin-core
- haskoin-node http-types monad-logger nqe optparse-applicative
- rocksdb-haskell scotty string-conversions text unliftio
+ aeson base binary bytestring cereal conduit data-default directory
+ filepath haskoin-core haskoin-node http-types monad-logger nqe
+ optparse-applicative rocksdb-haskell scotty string-conversions text
+ transformers unliftio unordered-containers
];
testHaskellDepends = [
- base haskoin-core haskoin-node hspec monad-logger mtl nqe
- rocksdb-haskell unliftio
+ base data-default haskoin-core haskoin-node hspec monad-logger mtl
+ nqe rocksdb-haskell transformers unliftio unordered-containers
];
description = "Storage and index for Bitcoin and Bitcoin Cash";
license = stdenv.lib.licenses.publicDomain;
@@ -100355,6 +100638,264 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasktorch" = callPackage
+ ({ mkDerivation, backprop, base, dimensions, generic-lens
+ , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc
+ , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th
+ , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl
+ , QuickCheck, safe-exceptions, singletons, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "hasktorch";
+ version = "0.0.1.0";
+ sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef
+ hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc
+ safe-exceptions singletons text
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ backprop base dimensions generic-lens ghc-typelits-natnormalise
+ hspec microlens-platform monad-loops mtl QuickCheck singletons time
+ transformers
+ ];
+ doHaddock = false;
+ description = "Torch for tensors and neural networks in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-codegen" = callPackage
+ ({ mkDerivation, base, containers, directory, hashable, hspec
+ , hspec-discover, megaparsec, optparse-applicative, pretty-show
+ , QuickCheck, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hasktorch-codegen";
+ version = "0.0.1.1";
+ sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory hashable megaparsec pretty-show text
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ base optparse-applicative pretty-show
+ ];
+ testHaskellDepends = [
+ base containers hspec hspec-discover megaparsec pretty-show
+ QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Code generation tools for Hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-ffi-tests" = callPackage
+ ({ mkDerivation, base, hasktorch-types-th, hspec, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-tests";
+ version = "0.0.1.0";
+ sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc";
+ libraryHaskellDepends = [
+ base hasktorch-types-th hspec QuickCheck text
+ ];
+ description = "Testing library for Hasktorch's FFI bindings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-ffi-th" = callPackage
+ ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+ , hasktorch-types-th, hspec, inline-c, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-th";
+ version = "0.0.1.0";
+ sha256 = "10gdvkwcjjzmrvmlz8vf823ja1jpab1nrph5lq46fcz8nqycsjq0";
+ libraryHaskellDepends = [ base hasktorch-types-th inline-c text ];
+ librarySystemDepends = [ ATen ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text
+ ];
+ description = "Bindings to Torch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {ATen = null;};
+
+ "hasktorch-ffi-thc" = callPackage
+ ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+ , hasktorch-ffi-th, hasktorch-types-th, hasktorch-types-thc, hspec
+ , inline-c, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-thc";
+ version = "0.0.1.0";
+ sha256 = "0l3xvhdyn2dzw999fbhihl20s3q01r5vp247d0rh27zvyszg7l3y";
+ libraryHaskellDepends = [
+ base hasktorch-types-th hasktorch-types-thc inline-c text
+ ];
+ librarySystemDepends = [ ATen ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ base hasktorch-ffi-tests hasktorch-ffi-th hasktorch-types-th
+ hasktorch-types-thc hspec QuickCheck text
+ ];
+ description = "Bindings to Cutorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {ATen = null;};
+
+ "hasktorch-indef" = callPackage
+ ({ mkDerivation, backprop, base, containers, deepseq, dimensions
+ , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-signatures
+ , hasktorch-signatures-partial, hasktorch-signatures-support
+ , hasktorch-types-th, hspec, managed, mtl, QuickCheck
+ , safe-exceptions, singletons, text, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hasktorch-indef";
+ version = "0.0.1.0";
+ sha256 = "0xmz7jid3sg3d2b4q1051fs7g0fljgvqxqwhzhd4g85fx7zr5nk3";
+ libraryHaskellDepends = [
+ backprop base containers deepseq dimensions
+ ghc-typelits-natnormalise hasktorch-ffi-th hasktorch-signatures
+ hasktorch-signatures-partial hasktorch-signatures-support
+ hasktorch-types-th managed mtl safe-exceptions singletons text
+ transformers vector
+ ];
+ testHaskellDepends = [
+ backprop base dimensions ghc-typelits-natnormalise hasktorch-ffi-th
+ hasktorch-types-th hspec mtl QuickCheck singletons text
+ transformers
+ ];
+ doHaddock = false;
+ description = "Core Hasktorch abstractions wrapping FFI bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures" = callPackage
+ ({ mkDerivation, base, hasktorch-ffi-th, hasktorch-ffi-thc
+ , hasktorch-signatures-partial, hasktorch-signatures-support
+ , hasktorch-signatures-types, hasktorch-types-th
+ , hasktorch-types-thc
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures";
+ version = "0.0.1.0";
+ sha256 = "1p8c3h0naqcbjxb3jbiss9zgfyg0hj0wcb6qlid6kwy925i4cyk1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base hasktorch-signatures-partial hasktorch-signatures-support
+ hasktorch-signatures-types hasktorch-types-th hasktorch-types-thc
+ ];
+ executableHaskellDepends = [
+ base hasktorch-ffi-th hasktorch-ffi-thc hasktorch-types-th
+ hasktorch-types-thc
+ ];
+ doHaddock = false;
+ description = "Backpack signatures for Tensor operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-partial" = callPackage
+ ({ mkDerivation, base, hasktorch-signatures-types
+ , hasktorch-types-th
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures-partial";
+ version = "0.0.1.0";
+ sha256 = "12dc5i4818j4q09mdshygz16zq1zyp32k6c1imgp9dl6bl4l05ss";
+ libraryHaskellDepends = [
+ base hasktorch-signatures-types hasktorch-types-th
+ ];
+ description = "Functions to partially satisfy tensor signatures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-support" = callPackage
+ ({ mkDerivation, base, hasktorch-signatures-types
+ , hasktorch-types-th
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures-support";
+ version = "0.0.1.0";
+ sha256 = "1vfmpsmgak4ifhpqh15ycf01p8l3a5qas3m7lkg09y8mqimwq5hh";
+ libraryHaskellDepends = [
+ base hasktorch-signatures-types hasktorch-types-th
+ ];
+ doHaddock = false;
+ description = "Signatures for support tensors in hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-types" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "hasktorch-signatures-types";
+ version = "0.0.1.0";
+ sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2";
+ libraryHaskellDepends = [ base deepseq ];
+ doHaddock = false;
+ description = "Core types for Hasktorch backpack signatures";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-types-th" = callPackage
+ ({ mkDerivation, base, c2hs, inline-c }:
+ mkDerivation {
+ pname = "hasktorch-types-th";
+ version = "0.0.1.0";
+ sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd";
+ libraryHaskellDepends = [ base inline-c ];
+ libraryToolDepends = [ c2hs ];
+ description = "C-types for Torch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-types-thc" = callPackage
+ ({ mkDerivation, base, c2hs, hasktorch-types-th, inline-c }:
+ mkDerivation {
+ pname = "hasktorch-types-thc";
+ version = "0.0.1.0";
+ sha256 = "06jxjn9s34myy4v8ad42xqmkyad5qraj99a3vpcxfagjxwcn4hbd";
+ libraryHaskellDepends = [ base hasktorch-types-th inline-c ];
+ libraryToolDepends = [ c2hs ];
+ description = "C-types for Cutorch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-zoo" = callPackage
+ ({ mkDerivation, backprop, base, deepseq, dimensions, directory
+ , filepath, generic-lens, ghc-typelits-natnormalise, hashable
+ , hasktorch, JuicyPixels, microlens, mtl, mwc-random, primitive
+ , safe-exceptions, singletons, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hasktorch-zoo";
+ version = "0.0.1.0";
+ sha256 = "1cpk2q1m68y7wljaki1d4a4y45hqh34ia8r6zfw0b62f9b6zihjm";
+ libraryHaskellDepends = [
+ backprop base deepseq dimensions directory filepath generic-lens
+ ghc-typelits-natnormalise hashable hasktorch JuicyPixels microlens
+ mtl mwc-random primitive safe-exceptions singletons transformers
+ vector
+ ];
+ description = "Neural architectures in hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskus-binary" = callPackage
({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
, mtl, QuickCheck, tasty, tasty-quickcheck
@@ -100403,8 +100944,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils";
- version = "1.0";
- sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
+ version = "1.1";
+ sha256 = "1grbj23545b7wxxyc4rra681k9c8xg36swlql3rgcr15m61fm647";
libraryHaskellDepends = [
base containers extra file-embed haskus-utils-data
haskus-utils-types haskus-utils-variant list-t mtl
@@ -100423,8 +100964,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-data";
- version = "1.0";
- sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+ version = "1.1";
+ sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di";
libraryHaskellDepends = [
base containers extra haskus-utils-types mtl recursion-schemes
transformers
@@ -100437,23 +100978,26 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "haskus-utils-types";
- version = "1.0";
- sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+ version = "1.1";
+ sha256 = "1fihf61z5078l73a08fvm5qb67dr3yc32nhgakkldd0fbh7clyrz";
libraryHaskellDepends = [ base ];
description = "Haskus utility modules";
license = stdenv.lib.licenses.bsd3;
}) {};
"haskus-utils-variant" = callPackage
- ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }:
+ ({ mkDerivation, base, haskus-utils-data, haskus-utils-types, tasty
+ , tasty-quickcheck, template-haskell
+ }:
mkDerivation {
pname = "haskus-utils-variant";
- version = "1.0";
- sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+ version = "2.0.3";
+ sha256 = "0yxlpznmc5yyv9ibx38f2slcj8r70qcz963j2fsbi5xr88ih7and";
libraryHaskellDepends = [
- base haskus-utils-data haskus-utils-types
+ base haskus-utils-data haskus-utils-types template-haskell
];
- description = "Haskus utility modules";
+ testHaskellDepends = [ base tasty tasty-quickcheck ];
+ description = "Variant and EADT";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -101192,6 +101736,7 @@ self: {
];
description = "A truth table generator for classical propositional logic";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haven" = callPackage
@@ -102917,17 +103462,18 @@ self: {
"heist" = callPackage
({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
- , blaze-html, bytestring, containers, criterion, directory
- , directory-tree, dlist, filepath, hashable, HUnit, lens
- , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
- , random, statistics, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, transformers
- , transformers-base, unordered-containers, vector, xmlhtml
+ , blaze-html, bytestring, containers, criterion
+ , criterion-measurement, directory, directory-tree, dlist, filepath
+ , hashable, HUnit, lens, lifted-base, map-syntax, monad-control
+ , mtl, process, QuickCheck, random, statistics, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
+ , transformers, transformers-base, unordered-containers, vector
+ , xmlhtml
}:
mkDerivation {
pname = "heist";
- version = "1.1";
- sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq";
+ version = "1.1.0.1";
+ sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
containers directory directory-tree dlist filepath hashable
@@ -102944,10 +103490,11 @@ self: {
];
benchmarkHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
- containers criterion directory directory-tree dlist filepath
- hashable HUnit lifted-base map-syntax monad-control mtl process
- random statistics test-framework test-framework-hunit text time
- transformers transformers-base unordered-containers vector xmlhtml
+ containers criterion criterion-measurement directory directory-tree
+ dlist filepath hashable HUnit lifted-base map-syntax monad-control
+ mtl process random statistics test-framework test-framework-hunit
+ text time transformers transformers-base unordered-containers
+ vector xmlhtml
];
description = "An Haskell template system supporting both HTML5 and XML";
license = stdenv.lib.licenses.bsd3;
@@ -103520,6 +104067,7 @@ self: {
];
description = "A command-line manager for delicious kitchen recipes";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hero-club-five-tenets" = callPackage
@@ -103789,8 +104337,8 @@ self: {
}:
mkDerivation {
pname = "hevm";
- version = "0.17";
- sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k";
+ version = "0.21";
+ sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104200,6 +104748,7 @@ self: {
];
description = "Heyting and Boolean algebras";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hfann" = callPackage
@@ -104643,8 +105192,8 @@ self: {
pname = "hgmp";
version = "0.1.1";
sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
- revision = "2";
- editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
+ revision = "3";
+ editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62";
libraryHaskellDepends = [ base ghc-prim integer-gmp ];
testHaskellDepends = [ base QuickCheck ];
description = "Haskell interface to GMP";
@@ -106195,8 +106744,8 @@ self: {
}:
mkDerivation {
pname = "hjugement";
- version = "2.0.0.20180903";
- sha256 = "0zvgabj0myn5ssfpj8l50z0jwcrqkfsixdhg1wq916y8ay7yi71n";
+ version = "2.0.0.20181030";
+ sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi";
libraryHaskellDepends = [
base containers hashable unordered-containers
];
@@ -107060,17 +107609,17 @@ self: {
}) {};
"hmatrix-quadprogpp" = callPackage
- ({ mkDerivation, base, hmatrix, quadprog, vector }:
+ ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
mkDerivation {
pname = "hmatrix-quadprogpp";
version = "0.4.0.0";
sha256 = "0bvgph7x5niryn4f1ah6726np2nv8xnrvqn3hbiw8f5m7314iv5l";
libraryHaskellDepends = [ base hmatrix vector ];
- librarySystemDepends = [ quadprog ];
+ librarySystemDepends = [ QuadProgpp ];
description = "Bindings to the QuadProg++ quadratic programming library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {quadprog = null;};
+ }) {inherit (pkgs) QuadProgpp;};
"hmatrix-repa" = callPackage
({ mkDerivation, base, hmatrix, repa, vector }:
@@ -107660,8 +108209,8 @@ self: {
}:
mkDerivation {
pname = "hoauth2";
- version = "1.7.2";
- sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf";
+ version = "1.8.1";
+ sha256 = "1b2rjqd8q0ybx26pmmsb1am9v6pnbp0xb3fzqvivxppdr5z6kl29";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108660,17 +109209,14 @@ self: {
}) {};
"hopenssl" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
- , HUnit, openssl
- }:
+ ({ mkDerivation, base, bytestring, HUnit, openssl }:
mkDerivation {
pname = "hopenssl";
- version = "2.2.1";
- sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "2.2.2";
+ sha256 = "0k589mi4sny88jaqxcqd0jgy6kmbzslxk6y1bk8xkvq73nvjxnjl";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ openssl ];
- testHaskellDepends = [ base doctest HUnit ];
+ testHaskellDepends = [ base HUnit ];
description = "FFI Bindings to OpenSSL's EVP Digest Interface";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -109262,7 +109808,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hpack_0_31_0" = callPackage
+ "hpack_0_31_1" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
, containers, cryptonite, deepseq, directory, filepath, Glob, hspec
, hspec-discover, http-client, http-client-tls, http-types, HUnit
@@ -109272,8 +109818,8 @@ self: {
}:
mkDerivation {
pname = "hpack";
- version = "0.31.0";
- sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9";
+ version = "0.31.1";
+ sha256 = "0fipbmmj4x588z7vh635mizhym9krydfxr49bgaf7xir4fsb4fmc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -109334,26 +109880,33 @@ self: {
}) {};
"hpack-dhall" = callPackage
- ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec
- , interpolate, megaparsec, mockery, text, transformers
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+ , dhall, dhall-json, Diff, filepath, hpack, megaparsec, microlens
+ , optparse-applicative, prettyprinter, tasty, tasty-golden, text
+ , transformers, utf8-string, yaml
}:
mkDerivation {
pname = "hpack-dhall";
- version = "0.3.0";
- sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
- revision = "3";
- editedCabalFile = "1paz90nmir7hrwp9yf2aair14gyiw8ql7f9vj2ry8r7q00xbpfv2";
- isLibrary = false;
+ version = "0.4.0";
+ sha256 = "04bjhfc5xqkvp58y28cifsq58l2rbc8xa7ywvzmk9hvw7acbixca";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+ megaparsec microlens prettyprinter text transformers yaml
+ ];
executableHaskellDepends = [
- aeson base dhall dhall-json hpack megaparsec text transformers
+ aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+ megaparsec microlens optparse-applicative prettyprinter text
+ transformers yaml
];
testHaskellDepends = [
- aeson base dhall dhall-json hpack hspec interpolate megaparsec
- mockery text transformers
+ aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff
+ filepath hpack megaparsec microlens prettyprinter tasty
+ tasty-golden text transformers utf8-string yaml
];
- description = "Dhall support for Hpack";
- license = stdenv.lib.licenses.publicDomain;
+ description = "hpack's dhalling";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -110826,8 +111379,8 @@ self: {
}:
mkDerivation {
pname = "hs2ats";
- version = "0.3.0.4";
- sha256 = "1mqm4yblv22368v01xq59ppi4ifjpqlswfirm6n42ckb47xhmy09";
+ version = "0.5.0.0";
+ sha256 = "0ga90mkz11iis5knd51dqpqd4qyj6fwl15nbdbwzlynpk0wsdsga";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -110906,6 +111459,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsPID" = callPackage
+ ({ mkDerivation, base, HUnit, lens }:
+ mkDerivation {
+ pname = "hsPID";
+ version = "0.1";
+ sha256 = "16ks8pvpd0rcw11zinzlldv21i6mbcbrnnq3j9z3vmcjpd25wzim";
+ libraryHaskellDepends = [ base lens ];
+ testHaskellDepends = [ base HUnit lens ];
+ description = "PID control loop";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"hsSqlite3" = callPackage
({ mkDerivation, base, bindings-sqlite3, bytestring, mtl
, utf8-string
@@ -111134,6 +111699,7 @@ self: {
testHaskellDepends = [ base tasty tasty-hspec ];
description = "A preprocessor that helps with writing Haskell bindings to C code";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hsc3" = callPackage
@@ -112098,6 +112664,24 @@ self: {
license = stdenv.lib.licenses.isc;
}) {};
+ "hsinstall_2_1" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
+ }:
+ mkDerivation {
+ pname = "hsinstall";
+ version = "2.1";
+ sha256 = "1azbzkslszq9pw4h91mp1zr6g6ad2haaf3g5146naf1f456z9zjg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [
+ base Cabal directory filepath heredoc process
+ ];
+ description = "Install Haskell software";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hskeleton" = callPackage
({ mkDerivation, base, Cabal }:
mkDerivation {
@@ -112746,14 +113330,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec_2_5_8" = callPackage
+ "hspec_2_6_0" = callPackage
({ mkDerivation, base, hspec-core, hspec-discover
, hspec-expectations, QuickCheck
}:
mkDerivation {
pname = "hspec";
- version = "2.5.8";
- sha256 = "061k4r1jlzcnl0mzvk5nvamw1bx36rs2a38958m2hlh2mmfnfnsr";
+ version = "2.6.0";
+ sha256 = "0qwla0bff2q52v27rxjgcp8g3yw0r2iyggp8ggmmabxkk983db6i";
libraryHaskellDepends = [
base hspec-core hspec-discover hspec-expectations QuickCheck
];
@@ -112804,6 +113388,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-contrib_0_5_1" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
+ mkDerivation {
+ pname = "hspec-contrib";
+ version = "0.5.1";
+ sha256 = "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc";
+ revision = "1";
+ editedCabalFile = "0vjmyrsb878914b4khwdy3fcn9n217q8k5xnszlrp7dl1jnbqyi4";
+ libraryHaskellDepends = [ base hspec-core HUnit ];
+ testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
+ description = "Contributed functionality for Hspec";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-core_2_4_8" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
, directory, filepath, hspec-expectations, hspec-meta, HUnit
@@ -112861,7 +113460,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-core_2_5_8" = callPackage
+ "hspec-core_2_6_0" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, hspec-meta
, HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112869,8 +113468,8 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.5.8";
- sha256 = "08y6rhzc2vwmrxzl3bc8iwklkhgzv7x90mf9fnjnddlyaj7wcjg5";
+ version = "2.6.0";
+ sha256 = "0f3fb6cgfp0yywxi9ii2vzmkrj669nprphcs1piad7bacsk12y6r";
libraryHaskellDepends = [
ansi-terminal array base call-stack clock deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112945,13 +113544,13 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-discover_2_5_8" = callPackage
+ "hspec-discover_2_6_0" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
}:
mkDerivation {
pname = "hspec-discover";
- version = "2.5.8";
- sha256 = "001i0ldxi88qcww2hh3mkdr6svw4kj23lf65camk9bgn5zwvq5aj";
+ version = "2.6.0";
+ sha256 = "17q5g5z7pylw8ghx1jbwk5qrafcg2cblpckvkwla1y3dzry43nc2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -113913,6 +114512,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {seccomp = null;};
+ "hssh" = callPackage
+ ({ mkDerivation, async, base, bytestring, cereal, containers
+ , cryptonite, data-default, memory, stm, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "hssh";
+ version = "0.1.0.0";
+ sha256 = "00g87418fhzcxf1xmrj9s40g6i1cgjx65ki027sqgkss49w1w6ig";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base bytestring cereal containers cryptonite data-default
+ memory stm
+ ];
+ testHaskellDepends = [
+ async base bytestring cereal containers cryptonite data-default
+ memory stm tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "SSH protocol implementation";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hsshellscript" = callPackage
({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
mkDerivation {
@@ -114589,8 +115211,8 @@ self: {
}:
mkDerivation {
pname = "html-conduit";
- version = "1.3.1";
- sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
+ version = "1.3.2";
+ sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85";
libraryHaskellDepends = [
attoparsec base bytestring conduit conduit-extra containers
resourcet text transformers xml-conduit xml-types
@@ -115192,6 +115814,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "http-client-openssl_0_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client
+ , http-types, network
+ }:
+ mkDerivation {
+ pname = "http-client-openssl";
+ version = "0.3.0.0";
+ sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl";
+ libraryHaskellDepends = [
+ base bytestring HsOpenSSL http-client network
+ ];
+ testHaskellDepends = [
+ base HsOpenSSL hspec http-client http-types
+ ];
+ doCheck = false;
+ description = "http-client backend using the OpenSSL library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-client-request-modifiers" = callPackage
({ mkDerivation, base, bytestring, exceptions, http-client
, http-media, http-types, network, network-uri
@@ -115956,16 +116598,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http2_1_6_4" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+ , case-insensitive, containers, criterion, directory, doctest
+ , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order
+ , psqueues, stm, text, unordered-containers, vector, word8
+ }:
+ mkDerivation {
+ pname = "http2";
+ version = "1.6.4";
+ sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring case-insensitive containers
+ network-byte-order psqueues stm
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty array base bytestring case-insensitive
+ containers directory doctest filepath Glob hex hspec
+ network-byte-order psqueues stm text unordered-containers vector
+ word8
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring case-insensitive containers criterion heaps
+ mwc-random network-byte-order psqueues stm
+ ];
+ description = "HTTP/2 library including frames, priority queues and HPACK";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http2-client" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, http2, network, stm, time, tls
}:
mkDerivation {
pname = "http2-client";
- version = "0.8.0.1";
- sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
- revision = "1";
- editedCabalFile = "190dhnj34b9xnpf6d3lj5a1fr90k2dy1l1i8505mp49lxzdvzkgc";
+ version = "0.8.0.2";
+ sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw";
libraryHaskellDepends = [
async base bytestring containers deepseq http2 network stm time tls
];
@@ -115980,8 +116651,8 @@ self: {
}:
mkDerivation {
pname = "http2-client-exe";
- version = "0.1.0.0";
- sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad";
+ version = "0.1.0.1";
+ sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -116991,14 +117662,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-ip_0_4_1" = callPackage
+ "hw-ip_0_4_2" = callPackage
({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
, hw-bits, hw-hspec-hedgehog, text
}:
mkDerivation {
pname = "hw-ip";
- version = "0.4.1";
- sha256 = "0kql3qvav2r0fsppiqa40s95938gfzkal5bkli3rhjiknj3vhbg7";
+ version = "0.4.2";
+ sha256 = "1jcfj75hlg7szvknw6v13barvcilldzh76jv1rnfyscrfhpdkd2s";
libraryHaskellDepends = [
attoparsec base generic-lens hw-bits text
];
@@ -117054,17 +117725,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-json_0_9_0_0" = callPackage
+ "hw-json_0_9_0_1" = callPackage
({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
- , bytestring, containers, criterion, directory, dlist, generic-lens
- , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
+ , bytestring, containers, criterion, directory, dlist, hspec
+ , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
, hw-rankselect, hw-rankselect-base, lens, mmap
- , optparse-applicative, resourcet, text, vector, word8
+ , optparse-applicative, text, vector, word8
}:
mkDerivation {
pname = "hw-json";
- version = "0.9.0.0";
- sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7";
+ version = "0.9.0.1";
+ sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -117073,9 +117744,9 @@ self: {
hw-rankselect-base mmap text vector word8
];
executableHaskellDepends = [
- base bytestring criterion dlist generic-lens hw-balancedparens
- hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens
- mmap optparse-applicative resourcet vector
+ base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery
+ hw-prim hw-rankselect hw-rankselect-base lens mmap
+ optparse-applicative vector
];
testHaskellDepends = [
attoparsec base bytestring containers hspec hw-balancedparens
@@ -117265,6 +117936,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-prim_0_6_2_18" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-prim";
+ version = "0.6.2.18";
+ sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip";
+ libraryHaskellDepends = [
+ base bytestring mmap semigroups transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions hedgehog hspec
+ hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion mmap semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hw-prim-bits" = callPackage
({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
, hw-hspec-hedgehog, QuickCheck, vector
@@ -117406,6 +118101,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-streams" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , ghc-prim, hedgehog, hspec, hw-bits, hw-hspec-hedgehog, hw-prim
+ , mmap, primitive, QuickCheck, semigroups, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-streams";
+ version = "0.0.0.6";
+ sha256 = "1pfzg1xq39x1mw91nkmswc3sprjh58cygblsqi69x7msgfjdl116";
+ libraryHaskellDepends = [
+ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
+ transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions ghc-prim hedgehog hspec
+ hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck
+ semigroups transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive
+ semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-string-parse" = callPackage
({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
mkDerivation {
@@ -119182,8 +119903,8 @@ self: {
}:
mkDerivation {
pname = "idris";
- version = "1.3.0";
- sha256 = "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48";
+ version = "1.3.1";
+ sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi";
configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
isLibrary = true;
isExecutable = true;
@@ -120490,28 +121211,6 @@ self: {
}) {};
"incremental-parser" = callPackage
- ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
- , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "incremental-parser";
- version = "0.3.1.1";
- sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
- revision = "1";
- editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i";
- libraryHaskellDepends = [ base monoid-subclasses ];
- testHaskellDepends = [
- base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion deepseq monoid-subclasses text
- ];
- description = "Generic parser library capable of providing partial results from partial input";
- license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "incremental-parser_0_3_2" = callPackage
({ mkDerivation, base, bytestring, checkers, criterion, deepseq
, monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
}:
@@ -121067,6 +121766,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "initialize" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "initialize";
+ version = "0.1.1.0";
+ sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
+ libraryHaskellDepends = [ base ];
+ description = "Initialization and Deinitialization of 'Storable' values";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"inj" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -121192,8 +121902,8 @@ self: {
}:
mkDerivation {
pname = "inline-c-cpp";
- version = "0.2.2.1";
- sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
+ version = "0.3.0.1";
+ sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701";
libraryHaskellDepends = [
base inline-c safe-exceptions template-haskell
];
@@ -121839,8 +122549,8 @@ self: {
}:
mkDerivation {
pname = "intero";
- version = "0.1.32";
- sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0";
+ version = "0.1.34";
+ sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -121900,22 +122610,6 @@ self: {
}) {};
"interpolatedstring-perl6" = callPackage
- ({ mkDerivation, base, bytestring, haskell-src-meta
- , template-haskell, text
- }:
- mkDerivation {
- pname = "interpolatedstring-perl6";
- version = "1.0.0";
- sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base bytestring haskell-src-meta template-haskell text
- ];
- description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "interpolatedstring-perl6_1_0_1" = callPackage
({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process
, template-haskell, text
}:
@@ -121930,7 +122624,6 @@ self: {
];
description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"interpolatedstring-qq" = callPackage
@@ -122121,15 +122814,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "intro_0_5_1_0" = callPackage
+ "intro_0_5_2_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, dlist
, extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
, unordered-containers, writer-cps-mtl
}:
mkDerivation {
pname = "intro";
- version = "0.5.1.0";
- sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs";
+ version = "0.5.2.1";
+ sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
libraryHaskellDepends = [
base bytestring containers deepseq dlist extra hashable mtl safe
text transformers unordered-containers writer-cps-mtl
@@ -122243,6 +122936,8 @@ self: {
pname = "invariant";
version = "0.5.1";
sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
+ revision = "1";
+ editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4";
libraryHaskellDepends = [
array base bifunctors comonad containers contravariant ghc-prim
profunctors semigroups StateVar stm tagged template-haskell
@@ -122477,8 +123172,8 @@ self: {
pname = "io-streams-haproxy";
version = "1.0.0.2";
sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
- revision = "3";
- editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa";
+ revision = "4";
+ editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l";
libraryHaskellDepends = [
attoparsec base bytestring io-streams network transformers
];
@@ -122788,25 +123483,6 @@ self: {
}) {};
"iproute" = callPackage
- ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
- , network, QuickCheck, safe
- }:
- mkDerivation {
- pname = "iproute";
- version = "1.7.5";
- sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
- libraryHaskellDepends = [
- appar base byteorder containers network
- ];
- testHaskellDepends = [
- appar base byteorder containers doctest hspec network QuickCheck
- safe
- ];
- description = "IP Routing Table";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "iproute_1_7_6" = callPackage
({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
, network, QuickCheck, safe
}:
@@ -122823,7 +123499,6 @@ self: {
];
description = "IP Routing Table";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"iptables-helpers" = callPackage
@@ -124396,8 +125071,8 @@ self: {
({ mkDerivation, alex, array, base, happy, pretty }:
mkDerivation {
pname = "java-adt";
- version = "0.2016.11.28";
- sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7";
+ version = "0.2018.11.4";
+ sha256 = "1pdp7yvq0gpbxw7gp61r5mkrhdiff0cvlxssxzvg770idp46j6p5";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -124815,6 +125490,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jmonkey" = callPackage
+ ({ mkDerivation, base, casing, free, jmacro }:
+ mkDerivation {
+ pname = "jmonkey";
+ version = "0.1.0.1";
+ sha256 = "1yhmhaa8ykjv3xivd7v10q3zw3pvgf45jk5wsbrr95s2p806n5nf";
+ libraryHaskellDepends = [ base casing free jmacro ];
+ testHaskellDepends = [ base casing free jmacro ];
+ description = "Jmonkey is very restricted but handy EDSL for JavaScript";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"jni" = callPackage
({ mkDerivation, base, bytestring, choice, constraints, containers
, cpphs, deepseq, inline-c, jdk, singletons
@@ -125726,8 +126413,8 @@ self: {
pname = "json-rpc-client";
version = "0.2.5.0";
sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
- revision = "8";
- editedCabalFile = "04dqdn9gdw5xgkm4cnzsph57xcjc01rm1fdfwcfdzg71mbyf8f7y";
+ revision = "9";
+ editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125772,8 +126459,8 @@ self: {
pname = "json-rpc-server";
version = "0.2.6.0";
sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
- revision = "5";
- editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9";
+ revision = "6";
+ editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125820,8 +126507,8 @@ self: {
pname = "json-sop";
version = "0.2.0.3";
sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h";
- revision = "1";
- editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48";
+ revision = "2";
+ editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp";
libraryHaskellDepends = [
aeson base generics-sop lens-sop tagged text time transformers
unordered-containers vector
@@ -126416,8 +127103,8 @@ self: {
}:
mkDerivation {
pname = "jvm-binary";
- version = "0.1.0";
- sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
+ version = "0.2.0";
+ sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4";
libraryHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
deepseq deriving-compat mtl template-haskell text vector
@@ -128040,6 +128727,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kind-apply" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "kind-apply";
+ version = "0.1.0.0";
+ sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
+ libraryHaskellDepends = [ base ];
+ description = "Utilities to work with lists of types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kind-generics" = callPackage
+ ({ mkDerivation, base, kind-apply }:
+ mkDerivation {
+ pname = "kind-generics";
+ version = "0.1.0.0";
+ sha256 = "1h6pb14b75lphlxzz7q08ihvg2phh082sx6a2zpdk5gwh8qzihpg";
+ libraryHaskellDepends = [ base kind-apply ];
+ description = "Generic programming in GHC style for arbitrary kinds and GADTs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kinds" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -128906,8 +129617,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot";
- version = "5.1.0.2";
- sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3";
+ version = "5.1.0.4";
+ sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -128931,8 +129642,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-core";
- version = "5.1.0.2";
- sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161";
+ version = "5.1.0.4";
+ sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk";
libraryHaskellDepends = [
base binary bytestring containers dependent-map dependent-sum
dependent-sum-template directory edit-distance filepath haskeline
@@ -128957,8 +129668,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-haskell-plugins";
- version = "5.1.0.3";
- sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a";
+ version = "5.1.0.4";
+ sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v";
libraryHaskellDepends = [
array arrows base bytestring containers data-memocombinators
directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -128978,8 +129689,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-irc-plugins";
- version = "5.1.0.1";
- sha256 = "1axixb6q5j7vs93q9d3n5v7l57nvnbjpry1ww8vaqlm71m1z4l2f";
+ version = "5.1.0.4";
+ sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf";
libraryHaskellDepends = [
base bytestring containers directory filepath lambdabot-core
lifted-base mtl network SafeSemaphore split time
@@ -128998,8 +129709,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-misc-plugins";
- version = "5.1.0.1";
- sha256 = "1bg15z7k21l0dwnkvprxvx5jcvs5igl8fqffg11y7h0r74f4yhks";
+ version = "5.1.0.4";
+ sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d";
libraryHaskellDepends = [
base bytestring containers filepath hstatsd lambdabot-core
lifted-base mtl network network-uri parsec process random random-fu
@@ -129018,8 +129729,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-novelty-plugins";
- version = "5.1.0.1";
- sha256 = "1ispnp12i2f8fcs11nay3mww8sa6dwx7lkl6d6gc9cfhzgwih6gi";
+ version = "5.1.0.4";
+ sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z";
libraryHaskellDepends = [
base binary brainfuck bytestring containers dice directory
lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -129035,8 +129746,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-reference-plugins";
- version = "5.1.0.1";
- sha256 = "0s5923hsl1pzyayi4954livp4rsgx84slwpnr7mq8nhfsdxm84wp";
+ version = "5.1.0.4";
+ sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w";
libraryHaskellDepends = [
base bytestring containers HTTP lambdabot-core mtl network
network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -129051,8 +129762,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-social-plugins";
- version = "5.1.0.1";
- sha256 = "1p46qyb2x7h37xs9y69k1mc5v84rwvkrgkdwkl4cw6pmnkmjnl42";
+ version = "5.1.0.4";
+ sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz";
libraryHaskellDepends = [
base binary bytestring containers lambdabot-core mtl split time
];
@@ -129064,8 +129775,8 @@ self: {
({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
mkDerivation {
pname = "lambdabot-trusted";
- version = "5.1.0.1";
- sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r";
+ version = "5.1.0.4";
+ sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j";
libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
description = "Lambdabot trusted code";
license = "GPL";
@@ -129604,6 +130315,8 @@ self: {
pname = "language-c-quote";
version = "0.12.2";
sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb";
+ revision = "1";
+ editedCabalFile = "099w1lln1vm000sf06wrmq6gya5sx2w4flrlwqz2c8wwvv8c9j9h";
libraryHaskellDepends = [
array base bytestring containers exception-mtl
exception-transformers filepath haskell-src-meta mainland-pretty
@@ -129702,6 +130415,29 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "language-docker_8_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
+ , QuickCheck, split, template-haskell, text, th-lift, time
+ }:
+ mkDerivation {
+ pname = "language-docker";
+ version = "8.0.0";
+ sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n";
+ libraryHaskellDepends = [
+ base bytestring containers free megaparsec mtl prettyprinter split
+ template-haskell text th-lift time
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory filepath free Glob hspec HUnit
+ megaparsec mtl prettyprinter process QuickCheck split
+ template-haskell text th-lift time
+ ];
+ description = "Dockerfile parser, pretty-printer and embedded DSL";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-dockerfile" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath, free
, Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
@@ -129809,13 +130545,18 @@ self: {
}) {};
"language-elm" = callPackage
- ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }:
+ ({ mkDerivation, base, doctest, hspec, MissingH, mtl, pretty
+ , protolude
+ }:
mkDerivation {
pname = "language-elm";
- version = "0.1.0.3";
- sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz";
+ version = "0.1.1.3";
+ sha256 = "11g8jf7pbkb6gjwxjrwnk6hx38hjfymm421qnqd41cm0w2xmxbhh";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
- testHaskellDepends = [ base hspec mtl pretty protolude ];
+ libraryToolDepends = [ doctest ];
+ testHaskellDepends = [ base doctest hspec mtl pretty protolude ];
+ testToolDepends = [ doctest ];
description = "Generate elm code";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -130317,45 +131058,44 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "language-puppet_1_4_0" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+ "language-puppet_1_4_1" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
- , cryptonite, directory, exceptions, filecache, filepath
- , formatting, Glob, hashable, hruby, hslogger, hspec
- , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
- , megaparsec, memory, mtl, operational, optparse-applicative
- , parallel-io, parsec, parser-combinators, pcre-utils, process
- , protolude, random, regex-pcre-builtin, scientific, servant
- , servant-client, split, stm, strict-base-types, temporary, text
- , time, transformers, unix, unordered-containers, vector, yaml
+ , cryptonite, directory, filecache, filepath, formatting, Glob
+ , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
+ , http-client, lens, lens-aeson, megaparsec, memory, mtl
+ , operational, optparse-applicative, parsec, parser-combinators
+ , pcre-utils, protolude, random, regex-pcre-builtin, scientific
+ , servant, servant-client, split, stm, strict-base-types, temporary
+ , text, time, transformers, unix, unordered-containers, vector
+ , yaml
}:
mkDerivation {
pname = "language-puppet";
- version = "1.4.0";
- sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz";
+ version = "1.4.1";
+ sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
- case-insensitive containers cryptonite directory exceptions
- filecache filepath formatting hashable hruby hslogger hspec
- http-api-data http-client lens lens-aeson megaparsec memory mtl
- operational parsec parser-combinators pcre-utils process protolude
- random regex-pcre-builtin scientific servant servant-client split
- stm strict-base-types text time transformers unix
- unordered-containers vector yaml
+ case-insensitive containers cryptonite directory filecache filepath
+ formatting hashable hruby hslogger http-api-data http-client lens
+ lens-aeson megaparsec memory mtl operational parsec
+ parser-combinators pcre-utils protolude random regex-pcre-builtin
+ scientific servant servant-client split stm strict-base-types text
+ time transformers unix unordered-containers vector yaml
];
executableHaskellDepends = [
- aeson ansi-wl-pprint base bytestring containers Glob hslogger
- http-client lens megaparsec mtl optparse-applicative parallel-io
- regex-pcre-builtin strict-base-types text transformers
- unordered-containers vector yaml
+ aeson ansi-wl-pprint async base bytestring containers Glob hslogger
+ http-client lens mtl optparse-applicative regex-pcre-builtin
+ strict-base-types text transformers unordered-containers vector
+ yaml
];
testHaskellDepends = [
base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
- pcre-utils protolude scientific strict-base-types temporary text
- transformers unordered-containers vector
+ pcre-utils scientific strict-base-types temporary text transformers
+ unordered-containers vector
];
description = "Tools to parse and evaluate the Puppet DSL";
license = stdenv.lib.licenses.bsd3;
@@ -131386,18 +132126,6 @@ self: {
}) {};
"leancheck" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "leancheck";
- version = "0.7.5";
- sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g";
- libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [ base ];
- description = "Enumerative property-based testing";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "leancheck_0_7_7" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
@@ -131407,7 +132135,17 @@ self: {
testHaskellDepends = [ base ];
description = "Enumerative property-based testing";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "leancheck-enum-instances" = callPackage
+ ({ mkDerivation, base, enum-types, leancheck }:
+ mkDerivation {
+ pname = "leancheck-enum-instances";
+ version = "0.1.0.0";
+ sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1";
+ libraryHaskellDepends = [ base enum-types leancheck ];
+ description = "listable instances for small enum types";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"leankit-api" = callPackage
@@ -132040,6 +132778,8 @@ self: {
pname = "lens-sop";
version = "0.2.0.2";
sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
+ revision = "1";
+ editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
libraryHaskellDepends = [
base fclabels generics-sop transformers
];
@@ -132101,6 +132841,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lens-typelevel" = callPackage
+ ({ mkDerivation, base, singletons }:
+ mkDerivation {
+ pname = "lens-typelevel";
+ version = "0.1.1.0";
+ sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp";
+ libraryHaskellDepends = [ base singletons ];
+ description = "Type-level lenses using singletons";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-utils" = callPackage
({ mkDerivation, aeson, base, containers, data-default, lens
, monoid, split, template-haskell
@@ -132163,8 +132915,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.0.11.3";
- sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123";
+ version = "1.1.0.1";
+ sha256 = "1psb3ywbzg6k0cir5bxphjqmbzd0n1l2w3skkr31px79haa4wbm7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -132812,8 +133564,8 @@ self: {
}:
mkDerivation {
pname = "libmpd";
- version = "0.9.0.8";
- sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq";
+ version = "0.9.0.9";
+ sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv";
libraryHaskellDepends = [
attoparsec base bytestring containers data-default-class filepath
mtl network old-locale text time utf8-string
@@ -133413,14 +134165,15 @@ self: {
}:
mkDerivation {
pname = "lifted-stm";
- version = "0.1";
- sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+ version = "0.2";
+ sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq";
libraryHaskellDepends = [
array base monad-finally stm transformers transformers-abort
transformers-base transformers-compat
];
description = "STM operations lifted through monad transformer stacks";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lifted-threads" = callPackage
@@ -135137,8 +135890,8 @@ self: {
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.8";
- sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2";
+ version = "0.8.0.1";
+ sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -135294,6 +136047,8 @@ self: {
pname = "llvm-hs";
version = "7.0.1";
sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy";
+ revision = "1";
+ editedCabalFile = "0nxyjcnsph4mlyxqy47m67ayd4mnpxx3agy5vx7f4v74bg4xx44a";
setupHaskellDepends = [ base Cabal containers ];
libraryHaskellDepends = [
array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -136687,6 +137442,8 @@ self: {
pname = "long-double";
version = "0.1";
sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
+ revision = "1";
+ editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn";
libraryHaskellDepends = [ base integer-gmp ];
description = "FFI bindings for C long double";
license = stdenv.lib.licenses.bsd3;
@@ -136993,8 +137750,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "4";
- editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9";
+ revision = "5";
+ editedCabalFile = "0dfrgg60nd7l7pfjar1s1g380r4591y6ccv9fyh0n34ymhizk84y";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -137114,8 +137871,8 @@ self: {
}:
mkDerivation {
pname = "ltext";
- version = "0.1.2.2";
- sha256 = "12ql2p9zkib4m7hbfxzn8pxg0n9rgf35bhf1csrf48b6kzl9z28f";
+ version = "0.1.3";
+ sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -137129,8 +137886,9 @@ self: {
transformers unordered-containers
];
testHaskellDepends = [
- base QuickCheck quickcheck-combinators quickcheck-instances tasty
- tasty-quickcheck text
+ attoparsec base directory exceptions extra mtl pretty QuickCheck
+ quickcheck-combinators quickcheck-instances tasty tasty-quickcheck
+ text transformers unordered-containers
];
description = "Parameterized file evaluator";
license = stdenv.lib.licenses.bsd3;
@@ -137280,10 +138038,8 @@ self: {
}:
mkDerivation {
pname = "lucid";
- version = "2.9.10";
- sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
- revision = "1";
- editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
+ version = "2.9.11";
+ sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -138151,8 +138907,8 @@ self: {
}:
mkDerivation {
pname = "magic-wormhole";
- version = "0.1.0";
- sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x";
+ version = "0.2.1";
+ sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -138445,6 +139201,8 @@ self: {
pname = "mainland-pretty";
version = "0.7";
sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi";
+ revision = "1";
+ editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3";
libraryHaskellDepends = [
base containers srcloc text transformers
];
@@ -139179,6 +139937,8 @@ self: {
pname = "map-syntax";
version = "0.3";
sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k";
+ revision = "1";
+ editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44";
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [
base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -139651,27 +140411,6 @@ self: {
}) {};
"massiv" = callPackage
- ({ mkDerivation, base, bytestring, data-default, data-default-class
- , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
- , vector
- }:
- mkDerivation {
- pname = "massiv";
- version = "0.2.1.0";
- sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7";
- libraryHaskellDepends = [
- base bytestring data-default-class deepseq ghc-prim primitive
- vector
- ];
- testHaskellDepends = [
- base bytestring data-default deepseq hspec QuickCheck
- safe-exceptions vector
- ];
- description = "Massiv (Массив) is an Array Library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "massiv_0_2_2_0" = callPackage
({ mkDerivation, base, bytestring, data-default, data-default-class
, deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
, vector
@@ -139690,7 +140429,6 @@ self: {
];
description = "Massiv (Массив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"massiv-io" = callPackage
@@ -140464,17 +141202,15 @@ self: {
}:
mkDerivation {
pname = "mcm";
- version = "0.6.5.0";
- sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m";
- revision = "1";
- editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq";
+ version = "0.6.8.1";
+ sha256 = "1nn6s15c6wwi7b0afzqfczdmc0ivrc8ncychmjym93lw967vjm67";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base blaze-html bytestring containers directory filepath hostname
MissingH polyparse process text unix
];
- description = "Manages the contents of files and directories";
+ description = "Machine Configuration Manager";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -140952,7 +141688,7 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "megaparsec_7_0_1" = callPackage
+ "megaparsec_7_0_3" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, hspec, hspec-expectations, mtl
, parser-combinators, QuickCheck, scientific, text, transformers
@@ -140960,8 +141696,8 @@ self: {
}:
mkDerivation {
pname = "megaparsec";
- version = "7.0.1";
- sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb";
+ version = "7.0.3";
+ sha256 = "1zngs6x7d1yp192pg8b0j5banq4y1vr1fwh1mxrxx0834bmqrll0";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -141660,6 +142396,56 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "metar" = callPackage
+ ({ mkDerivation, base, checkers, deriving-compat, HTTP, lens
+ , network-uri, QuickCheck, semigroupoids, semigroups, tagsoup
+ , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck
+ , transformers
+ }:
+ mkDerivation {
+ pname = "metar";
+ version = "0.0.2";
+ sha256 = "1iaqjzy1a7hkvcni6ijkwwcsb433j3gkx9f7z8ng1yhlbcr9a556";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base deriving-compat HTTP lens network-uri semigroupoids semigroups
+ tagsoup tagsoup-selection transformers
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Australian METAR";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "metar-http" = callPackage
+ ({ mkDerivation, base, checkers, http-types, lens, metar
+ , network-uri, QuickCheck, semigroupoids, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+ , wai, warp
+ }:
+ mkDerivation {
+ pname = "metar-http";
+ version = "0.0.1";
+ sha256 = "0xpi9x1c05py659a94ldksn3z5xz9ws069gp1swam1fllg8xbxj6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base http-types lens metar network-uri semigroupoids semigroups
+ text transformers utf8-string wai warp
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "HTTP for METAR";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"metric" = callPackage
({ mkDerivation, base, data-default, edit-distance, hmatrix
, QuickCheck, test-framework, test-framework-quickcheck2, vector
@@ -141962,6 +142748,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens_0_4_10" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "microlens";
+ version = "0.4.10";
+ sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
+ libraryHaskellDepends = [ base ];
+ description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-aeson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
, deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
@@ -142027,6 +142825,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-ghc_0_4_10" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, microlens
+ , transformers
+ }:
+ mkDerivation {
+ pname = "microlens-ghc";
+ version = "0.4.10";
+ sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33";
+ libraryHaskellDepends = [
+ array base bytestring containers microlens transformers
+ ];
+ description = "microlens + array, bytestring, containers, transformers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-mtl" = callPackage
({ mkDerivation, base, microlens, mtl, transformers
, transformers-compat
@@ -142058,6 +142872,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-platform_0_3_11" = callPackage
+ ({ mkDerivation, base, hashable, microlens, microlens-ghc
+ , microlens-mtl, microlens-th, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microlens-platform";
+ version = "0.3.11";
+ sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
+ libraryHaskellDepends = [
+ base hashable microlens microlens-ghc microlens-mtl microlens-th
+ text unordered-containers vector
+ ];
+ description = "Feature-complete microlens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-th" = callPackage
({ mkDerivation, base, containers, microlens, template-haskell
, th-abstraction, transformers
@@ -143600,6 +144431,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "modular" = callPackage
+ ({ mkDerivation, base, ghc-typelits-knownnat }:
+ mkDerivation {
+ pname = "modular";
+ version = "0.1.0.0";
+ sha256 = "1md01c9rzw24nymllkabckv46l7076kac6c317h5jindsncm7b8i";
+ libraryHaskellDepends = [ base ghc-typelits-knownnat ];
+ description = "Type-safe modular arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"modular-arithmetic" = callPackage
({ mkDerivation, base, doctest, Glob }:
mkDerivation {
@@ -144237,8 +145079,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.29";
- sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv";
+ version = "0.3.30";
+ sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7";
libraryHaskellDepends = [
base bytestring conduit conduit-extra exceptions fast-logger
lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -145590,14 +146432,20 @@ self: {
}) {};
"monopati" = callPackage
- ({ mkDerivation, base, directory, free, split }:
+ ({ mkDerivation, base, directory, free, hedgehog, split
+ , transformers
+ }:
mkDerivation {
pname = "monopati";
- version = "0.1.2";
- sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8";
+ version = "0.1.3";
+ sha256 = "1g7n1m6df2c9rl99fii7x4a7z3xwv2mcvxd96gg1maji9709chqb";
libraryHaskellDepends = [ base directory free split ];
+ testHaskellDepends = [
+ base directory free hedgehog split transformers
+ ];
description = "Well-typed paths";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"montage" = callPackage
@@ -145666,6 +146514,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "monus" = callPackage
+ ({ mkDerivation, base, containers, smallcheck, tasty
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "monus";
+ version = "0.2.0.0";
+ sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base containers smallcheck tasty tasty-quickcheck tasty-smallcheck
+ ];
+ description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"monzo" = callPackage
({ mkDerivation, aeson, authenticate-oauth, base, bytestring
, containers, hspec, http-client, http-client-tls, mtl, network
@@ -146140,25 +147004,26 @@ self: {
}) {inherit (pkgs) mpg123;};
"mpi-hs" = callPackage
- ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty
- , tasty-hspec, tasty-hunit, unix
+ ({ mkDerivation, base, binary, bytestring, c2hs, criterion
+ , monad-loops, openmpi, packman, store
}:
mkDerivation {
pname = "mpi-hs";
- version = "0.1.0.1";
- sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf";
+ version = "0.4.1.0";
+ sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base ];
+ libraryHaskellDepends = [
+ base binary bytestring monad-loops packman store
+ ];
librarySystemDepends = [ openmpi ];
libraryToolDepends = [ c2hs ];
executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base monad-loops tasty tasty-hspec tasty-hunit unix
- ];
+ testHaskellDepends = [ base monad-loops ];
benchmarkHaskellDepends = [ base criterion ];
description = "MPI bindings for Haskell";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) openmpi;};
"mpppc" = callPackage
@@ -147003,6 +147868,48 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "multilinear" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, mwc-random
+ , primitive, statistics, vector
+ }:
+ mkDerivation {
+ pname = "multilinear";
+ version = "0.2.3.0";
+ sha256 = "0kx9a7iysihkaapgz8hwa5sn0c1z69yiagxmw0n5i1bjmslzssvb";
+ libraryHaskellDepends = [
+ base containers deepseq mwc-random primitive statistics vector
+ ];
+ testHaskellDepends = [ base criterion ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Comprehensive and efficient (multi)linear algebra implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "multilinear-io" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cassava, cereal
+ , cereal-vector, conduit, criterion, deepseq, directory, either
+ , multilinear, transformers, vector, zlib
+ }:
+ mkDerivation {
+ pname = "multilinear-io";
+ version = "0.2.3";
+ sha256 = "1ymlx7pg0w33a703mqdr4rd93f828xp6ygs4az1y9j0miwax9y97";
+ revision = "1";
+ editedCabalFile = "0xpf219r7n7hqh7b37mr9scy965mxfh9j871ayaab1mb0s7rglw9";
+ libraryHaskellDepends = [
+ aeson base bytestring cassava cereal cereal-vector conduit either
+ multilinear transformers vector zlib
+ ];
+ testHaskellDepends = [
+ base directory either multilinear transformers
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq directory either multilinear transformers
+ ];
+ description = "Input/output capability for multilinear package";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"multimap" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -147219,10 +148126,8 @@ self: {
({ mkDerivation, base, containers, deepseq, doctest, Glob }:
mkDerivation {
pname = "multiset";
- version = "0.3.4";
- sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp";
- revision = "1";
- editedCabalFile = "0m7xk2217a5zpwb1hwp5j5r6yzlf0f4lmlnln2lb9bqihjl3j9x8";
+ version = "0.3.4.1";
+ sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh";
libraryHaskellDepends = [ base containers deepseq ];
testHaskellDepends = [ base doctest Glob ];
description = "The Data.MultiSet container type";
@@ -148347,6 +149252,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mysql-haskell_0_8_4_1" = callPackage
+ ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
+ , blaze-textual, bytestring, bytestring-lexing, cryptonite
+ , io-streams, memory, monad-loops, network, scientific, tasty
+ , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
+ , word24
+ }:
+ mkDerivation {
+ pname = "mysql-haskell";
+ version = "0.8.4.1";
+ sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x";
+ libraryHaskellDepends = [
+ base binary binary-ieee754 binary-parsers blaze-textual bytestring
+ bytestring-lexing cryptonite io-streams memory monad-loops network
+ scientific tcp-streams text time tls vector wire-streams word24
+ ];
+ testHaskellDepends = [
+ base bytestring io-streams tasty tasty-hunit text time vector
+ ];
+ description = "pure haskell MySQL driver";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mysql-haskell-nem" = callPackage
({ mkDerivation, base, bytestring, io-streams, mysql-haskell
, scientific, text, time
@@ -148524,6 +149453,68 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "n2o" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, hspec, text
+ }:
+ mkDerivation {
+ pname = "n2o";
+ version = "0.11.1";
+ sha256 = "0yvgis2v2jgdny50py8xmc9b1p2zi5kjgf45xsgsyyhzjyr30kb7";
+ libraryHaskellDepends = [ base binary bytestring containers text ];
+ testHaskellDepends = [ base hspec ];
+ description = "Abstract Protocol Loop";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-nitro" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , containers, n2o, text
+ }:
+ mkDerivation {
+ pname = "n2o-nitro";
+ version = "0.11.2";
+ sha256 = "1vh0r03h0k60z4q722pw4h5q0l7l56fmyp57im0nankci8vj0s38";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring containers n2o text
+ ];
+ description = "Nitro Elements, Events and Actions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-protocols" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , containers, n2o, n2o-nitro, time
+ }:
+ mkDerivation {
+ pname = "n2o-protocols";
+ version = "0.11.2";
+ sha256 = "1w5r99k9wvhbwvx0hzgpn1aahhnb84ib0n7xgq1ybpgy3s9cggzk";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring containers n2o n2o-nitro
+ time
+ ];
+ description = "N2O Protocols Starter Pack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-web" = callPackage
+ ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+ , bytestring, case-insensitive, containers, n2o, n2o-protocols
+ , network, text, websockets
+ }:
+ mkDerivation {
+ pname = "n2o-web";
+ version = "0.11.2";
+ sha256 = "0d01lsfd2rwavzm01bkk3020r0wpfqyyqjbdf1pc8hw1im3843p6";
+ libraryHaskellDepends = [
+ attoparsec base base64-bytestring binary bytestring
+ case-insensitive containers n2o n2o-protocols network text
+ websockets
+ ];
+ description = "N2O adapter for WebSockets";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"nagios-check" = callPackage
({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
, QuickCheck, text
@@ -148593,8 +149584,8 @@ self: {
}:
mkDerivation {
pname = "nakadi-client";
- version = "0.6.0.0";
- sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy";
+ version = "0.6.1.0";
+ sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x";
libraryHaskellDepends = [
aeson aeson-casing async async-timer base bytestring conduit
conduit-extra containers exceptions hashable http-client
@@ -150329,6 +151320,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "network-byte-order" = callPackage
+ ({ mkDerivation, base, bytestring, doctest }:
+ mkDerivation {
+ pname = "network-byte-order";
+ version = "0.0.0.0";
+ sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ base bytestring doctest ];
+ description = "Network byte order utilities";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"network-bytestring" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -150345,8 +151348,8 @@ self: {
({ mkDerivation, base, bytestring, network, text, time, vector }:
mkDerivation {
pname = "network-carbon";
- version = "1.0.13";
- sha256 = "06cc62fns07flmsl9gbdicmqqg5icmy3m4n0nvp2xqjk1ax8ws39";
+ version = "1.0.14";
+ sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b";
libraryHaskellDepends = [
base bytestring network text time vector
];
@@ -151051,8 +152054,8 @@ self: {
({ mkDerivation, base, doctest, network-uri, template-haskell }:
mkDerivation {
pname = "network-uri-static";
- version = "0.1.0.0";
- sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+ version = "0.1.1.0";
+ sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw";
libraryHaskellDepends = [ base network-uri template-haskell ];
testHaskellDepends = [ base doctest ];
description = "A small utility to declare type-safe static URIs";
@@ -151445,8 +152448,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools";
- version = "0.1.2.0";
- sha256 = "0vkcgj8y4jh63nwh0djxfjvkbpa66zpf32y5912lwj7xf6rm769q";
+ version = "0.2.1.1";
+ sha256 = "0z406bmfk9b1b6knpxwzkwh8n2cpfwgxdh52vghpgjf69c0yrjq1";
libraryHaskellDepends = [
aeson base binary bytestring ngx-export safe template-haskell
];
@@ -151681,18 +152684,18 @@ self: {
}) {};
"nix-deploy" = callPackage
- ({ mkDerivation, base, neat-interpolation, optparse-applicative
- , optparse-generic, text, turtle
+ ({ mkDerivation, base, bytestring, neat-interpolation
+ , optparse-applicative, optparse-generic, text, turtle
}:
mkDerivation {
pname = "nix-deploy";
- version = "1.0.2";
- sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya";
+ version = "1.0.3";
+ sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base neat-interpolation optparse-applicative optparse-generic text
- turtle
+ base bytestring neat-interpolation optparse-applicative
+ optparse-generic text turtle
];
description = "Deploy Nix-built software to a NixOS machine";
license = stdenv.lib.licenses.asl20;
@@ -151705,8 +152708,8 @@ self: {
}:
mkDerivation {
pname = "nix-derivation";
- version = "1.0.1";
- sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc";
+ version = "1.0.2";
+ sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -151723,18 +152726,18 @@ self: {
"nix-diff" = callPackage
({ mkDerivation, attoparsec, base, containers, Diff, mtl
- , nix-derivation, optparse-generic, system-filepath, text, unix
+ , nix-derivation, optparse-applicative, system-filepath, text, unix
, vector
}:
mkDerivation {
pname = "nix-diff";
- version = "1.0.4";
- sha256 = "1ggsqm8bcfvx3l2nji90gwllkq2v832wihf8msfi9br4mqwx234j";
+ version = "1.0.5";
+ sha256 = "1gs19y4k4aykm3hzpkygdx5wqblcnqxbh3jq3hl18sm8h4cf9871";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- attoparsec base containers Diff mtl nix-derivation optparse-generic
- system-filepath text unix vector
+ attoparsec base containers Diff mtl nix-derivation
+ optparse-applicative system-filepath text unix vector
];
description = "Explain why two Nix derivations differ";
license = stdenv.lib.licenses.bsd3;
@@ -151807,6 +152810,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nixpkgs-update" = callPackage
+ ({ mkDerivation, base, directory, doctest, errors, filepath, github
+ , mtl, neat-interpolation, optparse-applicative, regex-applicative
+ , shelly, text, time, unix, vector
+ }:
+ mkDerivation {
+ pname = "nixpkgs-update";
+ version = "0.2.0";
+ sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base directory errors filepath github mtl neat-interpolation
+ optparse-applicative regex-applicative shelly text time unix vector
+ ];
+ testHaskellDepends = [
+ base directory doctest errors filepath github mtl
+ neat-interpolation optparse-applicative regex-applicative shelly
+ text time unix vector
+ ];
+ description = "Tool for semi-automatic updating of nixpkgs repository";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"nkjp" = callPackage
({ mkDerivation, base, bytestring, containers, data-named, filepath
, polysoup, tar, text, zlib
@@ -153233,17 +154260,21 @@ self: {
}) {};
"nuxeo" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, conduit
- , conduit-extra, text, time
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+ , conduit-extra, http-conduit, http-types, optparse-applicative
+ , text, time, url
}:
mkDerivation {
pname = "nuxeo";
- version = "0.2.0.3";
- sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
+ version = "0.3.2";
+ sha256 = "0m0rnrcay92vi47dd6cbba5vdjzdrmwb9s7wic95cbsb7wmajc72";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bytestring conduit conduit-extra text time
+ aeson attoparsec base bytestring conduit conduit-extra http-conduit
+ http-types text time url
];
- description = "Nuxeo";
+ executableHaskellDepends = [ base optparse-applicative text ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -154404,20 +155435,21 @@ self: {
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, case-insensitive, containers, contravariant, dotenv, hspec
, hspec-discover, multiset, postgresql-simple, pretty
- , product-profunctors, profunctors, QuickCheck, semigroups, text
- , time, time-locale-compat, transformers, uuid, void
+ , product-profunctors, profunctors, QuickCheck, scientific
+ , semigroups, text, time, time-locale-compat, transformers, uuid
+ , void
}:
mkDerivation {
pname = "opaleye";
- version = "0.6.1.0";
- sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
- revision = "2";
- editedCabalFile = "07yn6xzynvjz9p6mv9kzh1sz05dqqsmihznba8s9q36lixlslyag";
+ version = "0.6.7003.1";
+ sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx";
+ revision = "1";
+ editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
- profunctors semigroups text time time-locale-compat transformers
- uuid void
+ profunctors scientific semigroups text time time-locale-compat
+ transformers uuid void
];
testHaskellDepends = [
aeson base containers contravariant dotenv hspec hspec-discover
@@ -155806,8 +156838,8 @@ self: {
}:
mkDerivation {
pname = "order-statistic-tree";
- version = "0.1.1.0";
- sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80";
+ version = "0.1.1.1";
+ sha256 = "13fhnbsx95w79r7lb1mfah8hj3cp6cqpphy31ajc6gcnzbiaqgk5";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
benchmarkHaskellDepends = [
@@ -155850,8 +156882,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "ordered-containers";
- version = "0.1.0";
- sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b";
+ version = "0.1.1";
+ sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a";
libraryHaskellDepends = [ base containers ];
description = "Set- and Map-like types that remember the order elements were inserted";
license = stdenv.lib.licenses.bsd3;
@@ -155938,8 +156970,8 @@ self: {
}:
mkDerivation {
pname = "orgmode-parse";
- version = "0.2.2";
- sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r";
+ version = "0.3.0";
+ sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers free hashable
old-locale semigroups text thyme unordered-containers
@@ -156836,7 +157868,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_3_1" = callPackage
+ "pandoc_2_4" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
, binary, blaze-html, blaze-markup, bytestring, Cabal
, case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -156846,13 +157878,14 @@ self: {
, http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
, parsec, process, QuickCheck, random, safe, SHA, skylighting
, split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
- , tasty-quickcheck, temporary, texmath, text, time, unix
- , unordered-containers, vector, weigh, xml, zip-archive, zlib
+ , tasty-quickcheck, temporary, texmath, text, time
+ , unicode-transforms, unix, unordered-containers, vector, weigh
+ , xml, zip-archive, zlib
}:
mkDerivation {
pname = "pandoc";
- version = "2.3.1";
- sha256 = "1wf38mqny53ygpaii0vfjrk0889ya7mlsi7hvvqjakjndcyqflbl";
+ version = "2.4";
+ sha256 = "1kf1v7zfifh5i1hw5bwdbd78ncp946kx1s501c077vwzdzvcz2ck";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -156865,8 +157898,8 @@ self: {
Glob haddock-library hslua hslua-module-text HsYAML HTTP
http-client http-client-tls http-types JuicyPixels mtl network
network-uri pandoc-types parsec process random safe SHA skylighting
- split syb tagsoup temporary texmath text time unix
- unordered-containers vector xml zip-archive zlib
+ split syb tagsoup temporary texmath text time unicode-transforms
+ unix unordered-containers vector xml zip-archive zlib
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -156894,8 +157927,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.14.5";
- sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8";
+ version = "0.14.8";
+ sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -156919,41 +157952,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "pandoc-citeproc_0_14_7" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
- , Cabal, containers, data-default, directory, filepath, hs-bibutils
- , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
- , setenv, split, syb, tagsoup, temporary, text, time
- , unordered-containers, vector, xml-conduit, yaml
- }:
- mkDerivation {
- pname = "pandoc-citeproc";
- version = "0.14.7";
- sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [
- aeson base bytestring containers data-default directory filepath
- hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
- setenv split syb tagsoup text time unordered-containers vector
- xml-conduit yaml
- ];
- executableHaskellDepends = [
- aeson aeson-pretty attoparsec base bytestring filepath pandoc
- pandoc-types syb text yaml
- ];
- testHaskellDepends = [
- aeson base bytestring containers directory filepath mtl pandoc
- pandoc-types process temporary text yaml
- ];
- doCheck = false;
- description = "Supports using pandoc with citeproc";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -157191,8 +158189,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-pyplot";
- version = "1.0.2.0";
- sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc";
+ version = "1.0.3.0";
+ sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -157243,8 +158241,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-types";
- version = "1.17.5.1";
- sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717";
+ version = "1.17.5.4";
+ sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j";
libraryHaskellDepends = [
aeson base bytestring containers deepseq ghc-prim QuickCheck syb
transformers
@@ -157917,8 +158915,8 @@ self: {
pname = "parallel-io";
version = "0.3.3";
sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
- revision = "1";
- editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm";
+ revision = "2";
+ editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -158555,8 +159553,8 @@ self: {
}:
mkDerivation {
pname = "parsers-megaparsec";
- version = "0.1.0.0";
- sha256 = "1xn12jbxv72hgkp9xarm9nr9rpqcijlyma47y31jz985r32nhaxj";
+ version = "0.1.0.1";
+ sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8";
libraryHaskellDepends = [
base fail megaparsec mtl parsers semigroups text transformers
];
@@ -158906,8 +159904,8 @@ self: {
}:
mkDerivation {
pname = "patat";
- version = "0.8.0.0";
- sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81";
+ version = "0.8.1.2";
+ sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -158944,8 +159942,8 @@ self: {
}:
mkDerivation {
pname = "patch-image";
- version = "0.3.2";
- sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk";
+ version = "0.3.2.1";
+ sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -159534,12 +160532,14 @@ self: {
pname = "pcre-heavy";
version = "1.0.0.2";
sha256 = "1lfbjgvl55jh226n307c2w8mrb3l1myzbkjh4j0jfcb8nybzcp4a";
+ revision = "1";
+ editedCabalFile = "14pprgwxkiaji3rqhsm0fv454wic6qxm7vy4a475yigadb1vz1ls";
libraryHaskellDepends = [
base base-compat bytestring pcre-light semigroups
string-conversions template-haskell
];
testHaskellDepends = [ base doctest Glob ];
- description = "A regexp library on top of pcre-light you can actually use";
+ description = "A regexp (regex) library on top of pcre-light you can actually use";
license = stdenv.lib.licenses.publicDomain;
}) {};
@@ -160429,6 +161429,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "persist" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, ghc-prim
+ , QuickCheck, test-framework, test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "persist";
+ version = "0.1";
+ sha256 = "0akiy8qrx71nj8l80hc7llxy7vnpcvjg01dhk499pl5mjaiqz2sq";
+ libraryHaskellDepends = [
+ array base bytestring containers ghc-prim text
+ ];
+ testHaskellDepends = [
+ base bytestring QuickCheck test-framework
+ test-framework-quickcheck2 text
+ ];
+ description = "Minimal serialization library with focus on performance";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"persist2er" = callPackage
({ mkDerivation, base, optparse-applicative, persistent, text }:
mkDerivation {
@@ -160825,6 +161844,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "persistent-mysql-haskell_0_5_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, conduit, containers
+ , io-streams, monad-logger, mysql-haskell, network, persistent
+ , persistent-template, resource-pool, resourcet, text, time, tls
+ , transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "persistent-mysql-haskell";
+ version = "0.5.0";
+ sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring conduit containers io-streams monad-logger
+ mysql-haskell network persistent resource-pool resourcet text time
+ tls transformers unliftio-core
+ ];
+ executableHaskellDepends = [
+ base monad-logger persistent persistent-template transformers
+ ];
+ description = "A pure haskell backend for the persistent library using MySQL database server";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-odbc" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -161120,6 +162164,27 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "persistent-template-classy" = callPackage
+ ({ mkDerivation, base, lens, persistent, persistent-sqlite
+ , persistent-template, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "persistent-template-classy";
+ version = "0.1.0.1";
+ sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a";
+ libraryHaskellDepends = [
+ base lens persistent persistent-sqlite persistent-template
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base lens persistent persistent-sqlite persistent-template
+ template-haskell text
+ ];
+ description = "Generate classy lens field accessors for persistent models";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-test" = callPackage
({ mkDerivation, aeson, aeson-compat, attoparsec, base
, base64-bytestring, blaze-builder, blaze-html, blaze-markup
@@ -161650,8 +162715,8 @@ self: {
}:
mkDerivation {
pname = "phoityne-vscode";
- version = "0.0.26.0";
- sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq";
+ version = "0.0.27.0";
+ sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -162968,6 +164033,8 @@ self: {
pname = "pipes-lzma";
version = "0.1.1.2";
sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc";
+ revision = "1";
+ editedCabalFile = "13nyh3qqv3baifya0vwnnqh1yvr3k2yjrhjq7apigq0s584iyrka";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring lzma pipes ];
@@ -163165,18 +164232,16 @@ self: {
"pipes-s3" = callPackage
({ mkDerivation, aws, base, bytestring, exceptions, http-client
, http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe
- , QuickCheck, resourcet, tasty, tasty-quickcheck, text
+ , QuickCheck, resourcet, semigroups, tasty, tasty-quickcheck, text
, transformers
}:
mkDerivation {
pname = "pipes-s3";
- version = "0.3.0.3";
- sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
- revision = "3";
- editedCabalFile = "14cz2sfyz0q0jrpjwj9a25flvcm7mhjhihg4pr356niyvnx1b01p";
+ version = "0.3.1";
+ sha256 = "1z32mgx3w5xiiaxcc22v492f03xlgkprn3pv1hqfqcfgsnxqbj5l";
libraryHaskellDepends = [
aws base bytestring http-client http-client-tls http-types pipes
- pipes-bytestring pipes-safe resourcet text transformers
+ pipes-bytestring pipes-safe resourcet semigroups text transformers
];
testHaskellDepends = [
base bytestring exceptions pipes pipes-bytestring pipes-safe
@@ -163473,6 +164538,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pixela" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, http-client
+ , http-client-tls, http-types, split, text, unordered-containers
+ , uri-encode, vector
+ }:
+ mkDerivation {
+ pname = "pixela";
+ version = "0.1.0.0";
+ sha256 = "02ab3n56j3y93wrwdj8rd3ff9zw9kskily1s9j2yq49zwpjnilpj";
+ revision = "3";
+ editedCabalFile = "0kndzh00saxdinyz5hbqkir9n578fz8db291nqynqpymw6lwkyc3";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default http-client http-client-tls
+ http-types split text unordered-containers uri-encode vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring data-default http-client http-client-tls
+ http-types split text unordered-containers uri-encode vector
+ ];
+ description = "Pixela client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pixelated-avatar-generator" = callPackage
({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels
, pureMD5, QuickCheck, random, split
@@ -163699,46 +164787,68 @@ self: {
({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal
, approximate, array, async, atomic-primops, base, base-orphans
, base16-bytestring, bits, bytestring, bytestring-lexing
- , case-insensitive, cborg, comonad, compact, constraints
- , containers, contravariant, contravariant-extras, deepseq
- , distributive, dlist, double-conversion, Earley, envparse, erf
- , exceptions, extra, fgl, filepath, foldl, free, gauge
- , generic-aeson, half, hashable, heaps, hedgehog
+ , case-insensitive, cborg, comonad, compact, compactable
+ , constraints, containers, contravariant, contravariant-extras
+ , deepseq, Diff, distributive, dlist, double-conversion, Earley
+ , email-validate, erf, exact-pi, exceptions, extra, fast-digits
+ , fgl, filepath, foldl, free, generic-aeson, generic-lens, half
+ , hashable, heaps, ilist, insert-ordered-containers
, integer-logarithms, lens, lens-aeson, list-transformer, logict
, managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random
- , network, network-info, network-uri, nf, optparse-applicative
- , parallel, parser-combinators, pointed, prettyprinter
- , prettyprinter-ansi-terminal, primitive, profunctors, psqueues
- , reactive-banana, reflection, regex-applicative, scientific
+ , neat-interpolation, network, network-info, network-uri, nf
+ , optparse-applicative, parallel, parser-combinators, pointed
+ , prettyprinter, prettyprinter-ansi-terminal, primitive
+ , profunctors, psqueues, random-bytestring, reactive-banana
+ , reflection, regex-applicative, safe, say, scientific
, semigroupoids, semigroups, semilattices, serialise, split, stm
- , stm-chans, stm-containers, tagged, text, text-short, time
- , transformers, transformers-base, transformers-compat
- , typed-process, unagi-chan, unix, unliftio, unordered-containers
- , utf8-string, uuid, uuid-types, vault, vector, vector-builder
- , weigh, writer-cps-mtl
+ , stm-chans, stm-containers, stringsearch, tagged, text
+ , text-metrics, text-short, time, transformers, transformers-base
+ , transformers-compat, typed-process, unagi-chan, unique, unix
+ , unliftio, unordered-containers, utf8-string, uuid, uuid-types
+ , vault, vector, vector-builder, writer-cps-mtl
}:
mkDerivation {
pname = "planet-mitchell";
- version = "0.0.0";
- sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp";
+ version = "0.1.0";
+ sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1";
libraryHaskellDepends = [
aeson aeson-pretty aeson-qq ansi-terminal approximate array async
atomic-primops base base-orphans base16-bytestring bits bytestring
bytestring-lexing case-insensitive cborg comonad compact
- constraints containers contravariant contravariant-extras deepseq
- distributive dlist double-conversion Earley envparse erf exceptions
- extra fgl filepath foldl free gauge generic-aeson half hashable
- heaps hedgehog integer-logarithms lens lens-aeson list-transformer
- logict managed megaparsec mmorph monad-ste mtl multiset mwc-random
- network network-info network-uri nf optparse-applicative parallel
- parser-combinators pointed prettyprinter
- prettyprinter-ansi-terminal primitive profunctors psqueues
- reactive-banana reflection regex-applicative scientific
- semigroupoids semigroups semilattices serialise split stm stm-chans
- stm-containers tagged text text-short time transformers
- transformers-base transformers-compat typed-process unagi-chan unix
- unliftio unordered-containers utf8-string uuid uuid-types vault
- vector vector-builder weigh writer-cps-mtl
+ compactable constraints containers contravariant
+ contravariant-extras deepseq Diff distributive dlist
+ double-conversion Earley email-validate erf exact-pi exceptions
+ extra fast-digits fgl filepath foldl free generic-aeson
+ generic-lens half hashable heaps ilist insert-ordered-containers
+ integer-logarithms lens lens-aeson list-transformer logict managed
+ megaparsec mmorph monad-ste mtl multiset mwc-random
+ neat-interpolation network network-info network-uri nf
+ optparse-applicative parallel parser-combinators pointed
+ prettyprinter prettyprinter-ansi-terminal primitive profunctors
+ psqueues random-bytestring reactive-banana reflection
+ regex-applicative safe say scientific semigroupoids semigroups
+ semilattices serialise split stm stm-chans stm-containers
+ stringsearch tagged text text-metrics text-short time transformers
+ transformers-base transformers-compat typed-process unagi-chan
+ unique unix unliftio unordered-containers utf8-string uuid
+ uuid-types vault vector vector-builder writer-cps-mtl
+ ];
+ description = "Planet Mitchell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "planet-mitchell-test" = callPackage
+ ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty
+ , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh
+ }:
+ mkDerivation {
+ pname = "planet-mitchell-test";
+ version = "0.0.0";
+ sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d";
+ libraryHaskellDepends = [
+ gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit
+ tasty-rerun weigh
];
description = "Planet Mitchell";
license = stdenv.lib.licenses.bsd3;
@@ -164795,6 +165905,18 @@ self: {
license = "LGPL";
}) {};
+ "polyparse_1_12_1" = callPackage
+ ({ mkDerivation, base, bytestring, text }:
+ mkDerivation {
+ pname = "polyparse";
+ version = "1.12.1";
+ sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx";
+ libraryHaskellDepends = [ base bytestring text ];
+ description = "A variety of alternative parser combinator libraries";
+ license = "LGPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"polyseq" = callPackage
({ mkDerivation, array, base, bytestring, cgi, containers
, free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -165158,6 +166280,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "port-utils" = callPackage
+ ({ mkDerivation, async, base, hspec, network, stm, transformers }:
+ mkDerivation {
+ pname = "port-utils";
+ version = "0.2.0.0";
+ sha256 = "1lvalwbizmvrrpbl2l1lblbv0c3qln1ln61x61zn26jxq2h8p7g1";
+ libraryHaskellDepends = [ base network ];
+ testHaskellDepends = [ async base hspec network stm transformers ];
+ description = "Utilities for creating and waiting on ports";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"portable-lines" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -167187,14 +168321,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pretty-show_1_8_2" = callPackage
+ "pretty-show_1_9_2" = callPackage
({ mkDerivation, array, base, filepath, ghc-prim, happy
, haskell-lexer, pretty, text
}:
mkDerivation {
pname = "pretty-show";
- version = "1.8.2";
- sha256 = "1fc431kr87hpk3rmdpbdiwsq0iyvh61hjwi4w0cp6zyasx8cg91a";
+ version = "1.9.2";
+ sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -168981,8 +170115,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "5.4.1";
- sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd";
+ version = "5.5.0";
+ sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170486,8 +171620,8 @@ self: {
}:
mkDerivation {
pname = "purescript-iso";
- version = "0.0.3";
- sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g";
+ version = "0.0.4";
+ sha256 = "1yqr8yfrc8vjn6h1wsfn0167ca6xj9wcl5a46zn9dklpkx995zyq";
libraryHaskellDepends = [
aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
base bytestring containers deepseq emailaddress monad-control mtl
@@ -171815,14 +172949,24 @@ self: {
({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
mkDerivation {
pname = "quickcheck-combinators";
- version = "0.0.4";
- sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv";
+ version = "0.0.5";
+ sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
- description = "Simple type-level combinators for augmenting QuickCheck instances";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "quickcheck-enum-instances" = callPackage
+ ({ mkDerivation, base, enum-types, QuickCheck }:
+ mkDerivation {
+ pname = "quickcheck-enum-instances";
+ version = "0.1.0.0";
+ sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc";
+ libraryHaskellDepends = [ base enum-types QuickCheck ];
+ description = "arbitrary instances for small enum types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"quickcheck-instances" = callPackage
({ mkDerivation, array, base, base-compat, bytestring
, case-insensitive, containers, hashable, old-time, QuickCheck
@@ -173761,8 +174905,10 @@ self: {
({ mkDerivation, base, stm, time, time-units }:
mkDerivation {
pname = "rate-limit";
- version = "1.4.0";
- sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb";
+ version = "1.4.1";
+ sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2";
+ revision = "1";
+ editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7";
libraryHaskellDepends = [ base stm time time-units ];
description = "A basic library for rate-limiting IO actions";
license = stdenv.lib.licenses.bsd3;
@@ -175077,8 +176223,8 @@ self: {
}:
mkDerivation {
pname = "records-sop";
- version = "0.1.0.1";
- sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc";
+ version = "0.1.0.2";
+ sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5";
libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
testHaskellDepends = [
base deepseq generics-sop hspec should-not-typecheck
@@ -175124,8 +176270,8 @@ self: {
pname = "recursion-schemes";
version = "5.0.3";
sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
- revision = "2";
- editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7";
+ revision = "3";
+ editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q";
libraryHaskellDepends = [
base base-orphans comonad free template-haskell th-abstraction
transformers
@@ -178239,10 +179385,8 @@ self: {
}:
mkDerivation {
pname = "resolv";
- version = "0.1.1.1";
- sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
- revision = "3";
- editedCabalFile = "0r1i7zrnynqxd3nzq4cz9648s3dmj29w63mcip57620d0fimyghm";
+ version = "0.1.1.2";
+ sha256 = "0wczdy3vmpfcfwjn1m95bygc5d83m97xxmavhdvy5ayn8c402fp4";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers
];
@@ -178250,7 +179394,7 @@ self: {
base bytestring directory filepath tasty tasty-hunit
];
description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.gpl2;
}) {};
"resolve" = callPackage
@@ -179199,19 +180343,6 @@ self: {
}) {};
"rfc5051" = callPackage
- ({ mkDerivation, base, bytestring, containers }:
- mkDerivation {
- pname = "rfc5051";
- version = "0.1.0.3";
- sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base bytestring containers ];
- description = "Simple unicode collation as per RFC5051";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "rfc5051_0_1_0_4" = callPackage
({ mkDerivation, base, bytestring, containers }:
mkDerivation {
pname = "rfc5051";
@@ -179222,7 +180353,6 @@ self: {
libraryHaskellDepends = [ base bytestring containers ];
description = "Simple unicode collation as per RFC5051";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rgb-color-model" = callPackage
@@ -180506,6 +181636,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rounded" = callPackage
+ ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr
+ , reflection, singletons
+ }:
+ mkDerivation {
+ pname = "rounded";
+ version = "0.1.0.1";
+ sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls";
+ libraryHaskellDepends = [
+ base ghc-prim hgmp long-double reflection singletons
+ ];
+ librarySystemDepends = [ gmp mpfr ];
+ testHaskellDepends = [ base long-double ];
+ description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
+
"rounding" = callPackage
({ mkDerivation, array, base, numeric-extras }:
mkDerivation {
@@ -180957,6 +182105,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rstream" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "rstream";
+ version = "0.1.0.0";
+ sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv";
+ libraryHaskellDepends = [ base ghc-prim ];
+ description = "stream-fusion framework from vector";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rtcm" = callPackage
({ mkDerivation, aeson, array, base, base64-bytestring
, basic-prelude, binary, binary-bits, binary-conduit, bytestring
@@ -182311,6 +183470,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sandi_0_4_3" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-th
+ }:
+ mkDerivation {
+ pname = "sandi";
+ version = "0.4.3";
+ sha256 = "0ji1zn9nkh8rdm0m9zpxdnz5zw0q0qypzyp2k9fn6j9v08r17p3n";
+ libraryHaskellDepends = [ base bytestring conduit exceptions ];
+ testHaskellDepends = [
+ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "Data encoding library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sandlib" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -183587,6 +184764,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "scotty-path-normalizer" = callPackage
+ ({ mkDerivation, base, bytestring, doctest, scotty, text, wai }:
+ mkDerivation {
+ pname = "scotty-path-normalizer";
+ version = "0.1.0.0";
+ sha256 = "1hv95q3ikf25d9kxzr48fxb2x1331c24n3q5nb47qa7866gy2f4q";
+ libraryHaskellDepends = [ base bytestring scotty text wai ];
+ testHaskellDepends = [ base doctest ];
+ description = "Redirect to a normalized path";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"scotty-resource" = callPackage
({ mkDerivation, base, containers, http-types, scotty, text
, transformers, wai
@@ -184400,8 +185589,8 @@ self: {
}:
mkDerivation {
pname = "secp256k1-haskell";
- version = "0.1.3";
- sha256 = "0wdxz8vmk5yfhjrwpynk1zpmvgl1rnwz7zvkx7g7pxxvz3z8rpbz";
+ version = "0.1.4";
+ sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l";
libraryHaskellDepends = [
base base16-bytestring bytestring cereal entropy hashable
QuickCheck string-conversions
@@ -185272,8 +186461,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "seqid";
- version = "0.5.3";
- sha256 = "1wc7a66k42njc0zv0cp4ycfv7jbcqyf77j9m6fikhdppbvn3cbn4";
+ version = "0.6.0";
+ sha256 = "1zm1zmzp3i60wb17ghr4rp5ljlhvsblll69x2ibjk7kh5icvwfqc";
libraryHaskellDepends = [ base mtl transformers ];
description = "Sequence ID production and consumption";
license = stdenv.lib.licenses.bsd3;
@@ -185295,8 +186484,8 @@ self: {
({ mkDerivation, base, io-streams, seqid }:
mkDerivation {
pname = "seqid-streams";
- version = "0.6.3";
- sha256 = "1wmi4iqh6q45cm1s9ml2yi5b34m8cj7y5a0aicjfsc8nyy0pq48r";
+ version = "0.7.0";
+ sha256 = "0z80cclvzkr6dg81n96dpan9a7285rlq9nmchiy4raxsjw4cza58";
libraryHaskellDepends = [ base io-streams seqid ];
description = "Sequence ID IO-Streams";
license = stdenv.lib.licenses.bsd3;
@@ -185652,6 +186841,8 @@ self: {
pname = "servant-JuicyPixels";
version = "0.3.0.4";
sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv";
+ revision = "1";
+ editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186121,8 +187312,8 @@ self: {
pname = "servant-client";
version = "0.14";
sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
- revision = "2";
- editedCabalFile = "087ja0xbwm1yg38i5pc26fxsjx4pfdcgqmw0h1lvf0z1alz8rq05";
+ revision = "3";
+ editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g";
libraryHaskellDepends = [
base base-compat bytestring containers exceptions http-client
http-media http-types monad-control mtl semigroupoids
@@ -186151,8 +187342,8 @@ self: {
pname = "servant-client-core";
version = "0.14.1";
sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
- revision = "1";
- editedCabalFile = "04xr6zpslw7pyzxp22qd8k2w9azc3pds5gplnwni12waqahf410i";
+ revision = "2";
+ editedCabalFile = "02pvrccfwvvy53gma56jcqnbia3pm1pncyghdkjp519bwff9iwvb";
libraryHaskellDepends = [
base base-compat base64-bytestring bytestring containers exceptions
free generics-sop http-api-data http-media http-types network-uri
@@ -186548,6 +187739,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-http2-client" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, bytestring
+ , case-insensitive, containers, data-default-class, exceptions
+ , http-media, http-types, http2, http2-client, mtl, servant
+ , servant-client-core, text, tls, transformers
+ }:
+ mkDerivation {
+ pname = "servant-http2-client";
+ version = "0.1.0.2";
+ sha256 = "0rjzc1dyj0njmh590ays5ma6243240qakrjgzi9qinvkgb7lzad2";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive containers exceptions
+ http-media http-types http2 http2-client mtl servant-client-core
+ text transformers
+ ];
+ testHaskellDepends = [
+ aeson async base binary bytestring case-insensitive containers
+ data-default-class exceptions http-media http-types http2
+ http2-client mtl servant servant-client-core text tls transformers
+ ];
+ description = "Generate HTTP2 clients from Servant API descriptions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-iCalendar" = callPackage
({ mkDerivation, base, data-default, http-media, iCalendar, servant
}:
@@ -186617,8 +187833,8 @@ self: {
}:
mkDerivation {
pname = "servant-kotlin";
- version = "0.1.1.2";
- sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb";
+ version = "0.1.1.3";
+ sha256 = "07adjx1smqg5x87dklgknlmkavns2axmhqw97fk0jnp99rb1rpb2";
libraryHaskellDepends = [
base containers directory formatting lens servant servant-foreign
text time wl-pprint-text
@@ -186960,10 +188176,8 @@ self: {
}:
mkDerivation {
pname = "servant-quickcheck";
- version = "0.0.7.2";
- sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
- revision = "1";
- editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
+ version = "0.0.7.3";
+ sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r";
libraryHaskellDepends = [
aeson base base-compat-batteries bytestring case-insensitive clock
data-default-class hspec http-client http-media http-types mtl
@@ -187329,34 +188543,6 @@ self: {
}) {};
"servant-swagger" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
- , cabal-doctest, directory, doctest, filepath, hspec
- , hspec-discover, http-media, insert-ordered-containers, lens
- , QuickCheck, servant, singleton-bool, swagger2, text, time
- , unordered-containers
- }:
- mkDerivation {
- pname = "servant-swagger";
- version = "1.1.5";
- sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
- revision = "5";
- editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson base bytestring hspec http-media insert-ordered-containers
- lens QuickCheck servant singleton-bool swagger2 text
- unordered-containers
- ];
- testHaskellDepends = [
- aeson aeson-qq base directory doctest filepath hspec lens
- QuickCheck servant swagger2 text time
- ];
- testToolDepends = [ hspec-discover ];
- description = "Generate Swagger specification for your servant API";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "servant-swagger_1_1_6" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
, Cabal, cabal-doctest, directory, doctest, filepath, hspec
, hspec-discover, http-media, insert-ordered-containers, lens
@@ -187380,7 +188566,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Generate Swagger specification for your servant API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-swagger-ui" = callPackage
@@ -187471,6 +188656,7 @@ self: {
];
description = "Servant swagger ui: Jens-Ole Graulund theme";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-swagger-ui-redoc" = callPackage
@@ -187487,6 +188673,7 @@ self: {
];
description = "Servant swagger ui: ReDoc theme";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-tracing" = callPackage
@@ -187703,7 +188890,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "serverless-haskell_0_7_5" = callPackage
+ "serverless-haskell_0_8_2" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
, amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
, hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -187711,8 +188898,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.7.5";
- sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
+ version = "0.8.2";
+ sha256 = "1ia1vjiw71qkqdpbna2jgxznwlhbh184fr5m95dcyl5kwwlb3nb8";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -188640,10 +189827,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.10.0.1";
- sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz";
- revision = "1";
- editedCabalFile = "0x23r58i4yhf9rcaxfdy09nr93cpkr0cmxrwcn11hgcr1nkzaa0d";
+ version = "1.10.2.0";
+ sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8";
libraryHaskellDepends = [
base binary dependency directory hs2ats language-ats microlens
shake shake-c shake-cabal shake-ext text
@@ -188883,31 +190068,6 @@ self: {
}) {};
"shakespeare" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
- , process, scientific, template-haskell, text, time, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "shakespeare";
- version = "2.0.18";
- sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr";
- libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim parsec process scientific template-haskell text
- time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim hspec HUnit parsec process template-haskell
- text time transformers
- ];
- description = "A toolkit for making compile-time interpolated templates";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ psibi ];
- }) {};
-
- "shakespeare_2_0_19" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
, process, scientific, template-haskell, text, time, transformers
@@ -188929,7 +190089,6 @@ self: {
];
description = "A toolkit for making compile-time interpolated templates";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
@@ -189026,6 +190185,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shannon-fano" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, split }:
+ mkDerivation {
+ pname = "shannon-fano";
+ version = "0.1.0.1";
+ sha256 = "11xpz5mi1yk9zcy22fhn6j4xnyifxgn07nd6nrx588h1g6w8r2df";
+ libraryHaskellDepends = [ base bytestring split ];
+ testHaskellDepends = [ base QuickCheck ];
+ description = "Shannon-fano compression algorithm implementation in Haskell";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shapefile" = callPackage
({ mkDerivation, base, binary, bytestring, data-binary-ieee754, dbf
, filepath, rwlock
@@ -189286,8 +190458,8 @@ self: {
({ mkDerivation, base, containers, text, unix }:
mkDerivation {
pname = "shell-monad";
- version = "0.6.5";
- sha256 = "0vg2g65km3i963scyj7fn17g562wg0mh88syxqrf7favnljid1bk";
+ version = "0.6.6";
+ sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038";
libraryHaskellDepends = [ base containers text unix ];
description = "shell monad";
license = stdenv.lib.licenses.bsd3;
@@ -189474,6 +190646,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shh" = callPackage
+ ({ mkDerivation, async, base, deepseq, directory, filepath, mtl
+ , process, split, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, unix
+ }:
+ mkDerivation {
+ pname = "shh";
+ version = "0.1.0.0";
+ sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base deepseq directory filepath mtl process split
+ template-haskell unix
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+ description = "Simple shell scripting from Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shift" = callPackage
({ mkDerivation, ansi-terminal, base, binary, bytestring
, composition-prelude, data-default, microlens
@@ -190159,6 +191353,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-affine-space" = callPackage
+ ({ mkDerivation, base, deepseq, directory, filepath, hlint, process
+ , regex-posix
+ }:
+ mkDerivation {
+ pname = "simple-affine-space";
+ version = "0.1";
+ sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh";
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [
+ base directory filepath hlint process regex-posix
+ ];
+ description = "A simple library for affine and vector spaces";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-atom" = callPackage
({ mkDerivation, base, containers, deepseq }:
mkDerivation {
@@ -190218,6 +191429,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "simple-cmd_0_1_2" = callPackage
+ ({ mkDerivation, base, directory, filepath, process }:
+ mkDerivation {
+ pname = "simple-cmd";
+ version = "0.1.2";
+ sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6";
+ libraryHaskellDepends = [ base directory filepath process ];
+ description = "Simple String-based process commands";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-conduit" = callPackage
({ mkDerivation, base, bifunctors, bytestring, CC-delcont
, chunked-data, conduit, conduit-combinators, conduit-extra
@@ -190698,8 +191921,8 @@ self: {
({ mkDerivation, base, process }:
mkDerivation {
pname = "simple-smt";
- version = "0.9.1";
- sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b";
+ version = "0.9.3";
+ sha256 = "17v8zpiiha8kyb4xbrqdnfibf1dwzf9lbhxj9kffvl948ygxdp8x";
libraryHaskellDepends = [ base process ];
description = "A simple way to interact with an SMT solver process";
license = stdenv.lib.licenses.bsd3;
@@ -190854,6 +192077,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-vec3_0_4_0_9" = callPackage
+ ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+ , QuickCheck, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "simple-vec3";
+ version = "0.4.0.9";
+ sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz";
+ libraryHaskellDepends = [ base QuickCheck vector ];
+ testHaskellDepends = [
+ base doctest doctest-driver-gen tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Three-dimensional vectors of doubles with basic operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-zipper" = callPackage
({ mkDerivation, base, hspec, lens }:
mkDerivation {
@@ -191071,10 +192312,10 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "simtreelo";
- version = "0.1.1.3";
- sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9";
+ version = "0.1.1.4";
+ sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
libraryHaskellDepends = [ base containers ];
- description = "Loader for data organized in a tree";
+ description = "Load data organized in a tree";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -191335,8 +192576,8 @@ self: {
}:
mkDerivation {
pname = "sitepipe";
- version = "0.3.0.1";
- sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l";
+ version = "0.3.0.2";
+ sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8";
libraryHaskellDepends = [
aeson base bytestring containers directory exceptions filepath Glob
lens lens-aeson megaparsec MissingH mtl mustache
@@ -191378,23 +192619,6 @@ self: {
}) {};
"size-based" = callPackage
- ({ mkDerivation, base, dictionary-sharing, template-haskell
- , testing-type-modifiers
- }:
- mkDerivation {
- pname = "size-based";
- version = "0.1.1.0";
- sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
- revision = "1";
- editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2";
- libraryHaskellDepends = [
- base dictionary-sharing template-haskell testing-type-modifiers
- ];
- description = "Sized functors, for size-based enumerations";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "size-based_0_1_2_0" = callPackage
({ mkDerivation, base, dictionary-sharing, template-haskell
, testing-type-modifiers
}:
@@ -191407,7 +192631,6 @@ self: {
];
description = "Sized functors, for size-based enumerations";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"sized" = callPackage
@@ -191863,30 +193086,6 @@ self: {
}) {};
"slack-web" = callPackage
- ({ mkDerivation, aeson, base, containers, errors, hspec
- , http-api-data, http-client, http-client-tls, megaparsec, mtl
- , servant, servant-client, servant-client-core, text, time
- , transformers
- }:
- mkDerivation {
- pname = "slack-web";
- version = "0.2.0.6";
- sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
- libraryHaskellDepends = [
- aeson base containers errors http-api-data http-client
- http-client-tls megaparsec mtl servant servant-client
- servant-client-core text time transformers
- ];
- testHaskellDepends = [
- aeson base containers errors hspec http-api-data megaparsec text
- time
- ];
- description = "Bindings for the Slack web API";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "slack-web_0_2_0_7" = callPackage
({ mkDerivation, aeson, base, containers, errors, hspec
, http-api-data, http-client, http-client-tls, megaparsec, mtl
, servant, servant-client, servant-client-core, text, time
@@ -191917,8 +193116,8 @@ self: {
}:
mkDerivation {
pname = "slate";
- version = "0.11.0.0";
- sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
+ version = "0.12.0.0";
+ sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -191958,15 +193157,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "slave-thread_1_0_2_2" = callPackage
+ "slave-thread_1_0_2_3" = callPackage
({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph
, partial-handler, QuickCheck, quickcheck-instances, rerebase
, SafeSemaphore, stm-containers, transformers
}:
mkDerivation {
pname = "slave-thread";
- version = "1.0.2.2";
- sha256 = "1jf8n989gsxbqkyxj8kd523dxp5bxs9cs4s6jd4j95mvij6pgpgl";
+ version = "1.0.2.3";
+ sha256 = "131zq1lb38mmavzdb2ysmnifmhvglb438q1p31pp5x4pmhdhnglj";
libraryHaskellDepends = [
base deferred-folds foldl mmorph partial-handler stm-containers
transformers
@@ -192823,8 +194022,8 @@ self: {
pname = "snap-core";
version = "1.0.3.2";
sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
- revision = "2";
- editedCabalFile = "0m0rjsgv0lkd0y9ragn478ibw98c9iys4mrj26x8ihasdnzgkqxq";
+ revision = "3";
+ editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers directory filepath hashable HUnit io-streams lifted-base
@@ -192901,8 +194100,8 @@ self: {
}:
mkDerivation {
pname = "snap-extras";
- version = "0.12.2.0";
- sha256 = "18d1gfpk2gzvaidb6l13y64540hfyqk5hw6gpx7z495ay1dafdzr";
+ version = "0.12.2.1";
+ sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -193027,8 +194226,8 @@ self: {
pname = "snap-server";
version = "1.1.0.0";
sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
- revision = "2";
- editedCabalFile = "03jmxbz9bf0yr3vzf3xa7ajbz3q9i6cn7bzqan4vy5f26c0n6xld";
+ revision = "3";
+ editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh";
configureFlags = [ "-fopenssl" ];
isLibrary = true;
isExecutable = true;
@@ -194338,8 +195537,8 @@ self: {
}:
mkDerivation {
pname = "socket";
- version = "0.8.1.0";
- sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0";
+ version = "0.8.2.0";
+ sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -194652,6 +195851,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sop-core" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "sop-core";
+ version = "0.4.0.0";
+ sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3";
+ libraryHaskellDepends = [ base deepseq ];
+ description = "True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sophia" = callPackage
({ mkDerivation, base, binary, bindings-sophia, bytestring
, criterion, directory, tasty, tasty-hunit
@@ -195273,14 +196483,21 @@ self: {
}) {};
"spdx" = callPackage
- ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+ ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck
+ , tasty, tasty-quickcheck, transformers
+ }:
mkDerivation {
pname = "spdx";
- version = "0.2.2.0";
- sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
- libraryHaskellDepends = [ base transformers ];
- testHaskellDepends = [ base tasty tasty-quickcheck ];
- description = "SPDX license expression language";
+ version = "1";
+ sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd";
+ libraryHaskellDepends = [ base Cabal containers transformers ];
+ testHaskellDepends = [
+ base base-compat Cabal tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base base-compat Cabal QuickCheck tasty-quickcheck
+ ];
+ description = "SPDX license expression language, Extras";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -195975,6 +197192,7 @@ self: {
];
description = "JSON API to HTML website wrapper";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"spritz" = callPackage
@@ -196716,11 +197934,12 @@ self: {
({ mkDerivation, base, gdp, ghc-prim, primitive }:
mkDerivation {
pname = "st2";
- version = "0.1.0.0";
- sha256 = "0gly0l191cwnahdrmgi1i2rx4430b9d684kl9s5frxa3k1711agj";
+ version = "0.1.0.2";
+ sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz";
libraryHaskellDepends = [ base gdp ghc-prim primitive ];
description = "shared heap regions between local mutable state threads";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stable-heap" = callPackage
@@ -198178,6 +199397,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "statsdi" = callPackage
+ ({ mkDerivation, base, bytestring, dequeue, ether, hashable, hspec
+ , network, random, stm, tasty, tasty-hspec, template-haskell, time
+ , transformers, transformers-lift, unordered-containers
+ }:
+ mkDerivation {
+ pname = "statsdi";
+ version = "0.2.0.0";
+ sha256 = "1gbaxrvn8ilrj808hplqlibawy9kdmfb5pc2yzzdghmcsjys24g1";
+ revision = "1";
+ editedCabalFile = "02kf7pigkvqsm720l8rn6m3gdjqrdhli5yijsjf8n11mj6k8xrk0";
+ libraryHaskellDepends = [
+ base bytestring dequeue ether hashable network random stm
+ template-haskell time transformers transformers-lift
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring hspec network stm tasty tasty-hspec time
+ ];
+ description = "A lovely [Dog]StatsD implementation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"status-notifier-item" = callPackage
({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
, filepath, hslogger, lens, network, optparse-applicative, spool
@@ -199054,7 +200297,7 @@ self: {
"store" = callPackage
({ mkDerivation, array, async, base, base-orphans
, base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
- , containers, contravariant, criterion, cryptohash, deepseq
+ , clock, containers, contravariant, criterion, cryptohash, deepseq
, directory, filepath, free, ghc-prim, hashable, hspec
, hspec-smallcheck, integer-gmp, lifted-base, monad-control
, mono-traversable, network, primitive, resourcet, safe, semigroups
@@ -199065,8 +200308,8 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.5.0";
- sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
+ version = "0.5.0.1";
+ sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -199079,11 +200322,11 @@ self: {
];
testHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
- bytestring cereal cereal-vector containers contravariant criterion
- cryptohash deepseq directory filepath free ghc-prim hashable hspec
- hspec-smallcheck integer-gmp lifted-base monad-control
- mono-traversable network primitive resourcet safe semigroups
- smallcheck store-core syb template-haskell text th-lift
+ bytestring cereal cereal-vector clock containers contravariant
+ criterion cryptohash deepseq directory filepath free ghc-prim
+ hashable hspec hspec-smallcheck integer-gmp lifted-base
+ monad-control mono-traversable network primitive resourcet safe
+ semigroups smallcheck store-core syb template-haskell text th-lift
th-lift-instances th-orphans th-reify-many th-utilities time
transformers unordered-containers vector vector-binary-instances
void weigh
@@ -199180,15 +200423,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_26_1" = callPackage
+ "stratosphere_0_26_2" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.26.1";
- sha256 = "0npmnj71gaf61gcxi772h4sgsz68j5jk7v5z3bjc120z7vc1a22v";
+ version = "0.26.2";
+ sha256 = "0f4vqll4bfwrf6hysdnh1gkjl79qcs1pwn3p6224xlqzmajb9hc5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199639,8 +200882,8 @@ self: {
}:
mkDerivation {
pname = "streaming-fft";
- version = "0.1.0.0";
- sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi";
+ version = "0.1.0.1";
+ sha256 = "1bs0wqcns0nn62rw04a1574qakqhflxhsybchf9pzig0gyrj4538";
libraryHaskellDepends = [
base contiguous-fft ghc-prim prim-instances primitive streaming
];
@@ -199876,7 +201119,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "streamly_0_5_1" = callPackage
+ "streamly_0_5_2" = callPackage
({ mkDerivation, atomic-primops, base, clock, containers, deepseq
, exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
, monad-control, mtl, QuickCheck, random, transformers
@@ -199884,8 +201127,8 @@ self: {
}:
mkDerivation {
pname = "streamly";
- version = "0.5.1";
- sha256 = "04hc87jwcfpbwydm75ic3rz87m76s39aysi14m514nib87xprbji";
+ version = "0.5.2";
+ sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -200668,8 +201911,8 @@ self: {
}:
mkDerivation {
pname = "structured-cli";
- version = "2.0.0.1";
- sha256 = "1xgf49pd1dm80qp1h14f2nyqv71axrijrd8k66jmmqkczf24jah2";
+ version = "2.2.1.0";
+ sha256 = "1b75wnmprbb4sfnwyn5arc205ad5rlyz4hv63ai35i9iryax875s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201362,28 +202605,27 @@ self: {
"super-user-spark" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
, filepath, genvalidity, genvalidity-hspec, genvalidity-hspec-aeson
- , genvalidity-path, hashable, hspec, hspec-core, HUnit, iostring
- , mtl, optparse-applicative, parsec, path, path-io, process
- , QuickCheck, text, transformers, unix, validity, validity-path
+ , genvalidity-path, hashable, hspec, hspec-core, mtl
+ , optparse-applicative, parsec, path, path-io, process, QuickCheck
+ , text, transformers, unix, validity, validity-path
}:
mkDerivation {
pname = "super-user-spark";
- version = "0.4.0.0";
- sha256 = "1yk0kkp9rj63m7vqvki7zs3l8r5da8as7hpw1l6qk2gf74lpkfdy";
+ version = "0.4.0.1";
+ sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring directory filepath hashable
- iostring mtl optparse-applicative parsec path path-io process text
- unix validity validity-path
+ aeson aeson-pretty base bytestring directory filepath hashable mtl
+ optparse-applicative parsec path path-io process text unix validity
+ validity-path
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
aeson aeson-pretty base bytestring directory filepath genvalidity
genvalidity-hspec genvalidity-hspec-aeson genvalidity-path hashable
- hspec hspec-core HUnit iostring mtl optparse-applicative parsec
- path path-io process QuickCheck text transformers unix validity
- validity-path
+ hspec hspec-core mtl optparse-applicative parsec path path-io
+ process QuickCheck text transformers unix validity validity-path
];
description = "Configure your dotfile deployment with a DSL";
license = stdenv.lib.licenses.mit;
@@ -202035,8 +203277,8 @@ self: {
pname = "swagger2";
version = "2.3.0.1";
sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f";
- revision = "1";
- editedCabalFile = "12w7bsld9wp2nm61vwdwb6ndjd3g99i0g4hjr32mrycmf41yvs1a";
+ revision = "2";
+ editedCabalFile = "0dfxf47mzzb5rmln2smsk0qx53kj1lc3a087r52g2rzz6971zivb";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson base base-compat-batteries bytestring containers generics-sop
@@ -202147,15 +203389,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
- "swish_0_10_0_0" = callPackage
+ "swish_0_10_0_1" = callPackage
({ mkDerivation, base, containers, directory, filepath, hashable
, HUnit, intern, mtl, network-uri, old-locale, polyparse
, semigroups, test-framework, test-framework-hunit, text, time
}:
mkDerivation {
pname = "swish";
- version = "0.10.0.0";
- sha256 = "1dm388lwfxrpdbqm3fdk9gjr8pp8y8s02wl9aan86av956g2kr4h";
+ version = "0.10.0.1";
+ sha256 = "1ikqqyra9r79vw2s969kyqh1vgijcr33y7irriylsp51n7pspagk";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -202180,8 +203422,8 @@ self: {
}:
mkDerivation {
pname = "sws";
- version = "0.4.2.0";
- sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4";
+ version = "0.4.3.0";
+ sha256 = "0zwh7az9pgsgvx9wbjnz8lzy2v8lrkkwv3h72jfy5sj50xylrzbr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -202424,8 +203666,8 @@ self: {
pname = "symbol";
version = "0.2.4";
sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
- revision = "1";
- editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25";
+ revision = "2";
+ editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1";
libraryHaskellDepends = [ base containers deepseq ];
description = "A 'Symbol' type for fast symbol comparison";
license = stdenv.lib.licenses.bsd3;
@@ -204788,6 +206030,8 @@ self: {
pname = "tasty-hedgehog-coverage";
version = "0.1.0.0";
sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c";
+ revision = "1";
+ editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f";
libraryHaskellDepends = [
base containers hedgehog mtl tagged tasty tasty-hedgehog text
transformers wl-pprint-annotated
@@ -205343,6 +206587,8 @@ self: {
pname = "tdigest";
version = "0.2.1";
sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
+ revision = "1";
+ editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-compat binary deepseq reducers semigroupoids transformers
@@ -206221,8 +207467,8 @@ self: {
}:
mkDerivation {
pname = "term-rewriting";
- version = "0.3";
- sha256 = "03y5s9c9n1mnij3yh5z4c69isg5cbpwczj5sjjvajqaaqf6xy5f3";
+ version = "0.3.0.1";
+ sha256 = "0fa2yqdhw93r7byx47z050sq2yc0arfsvwnzl4jp1vyhdzarfwqd";
libraryHaskellDepends = [
ansi-wl-pprint array base containers mtl multiset parsec
union-find-array
@@ -207099,10 +208345,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.11.1.1";
- sha256 = "1syvyiw84as79c76mssw1p4d3lrnghnwdyy4ip1w48qd07fadxf6";
- revision = "1";
- editedCabalFile = "0740lpg42r0wdj9hm9gvnzrjka9mqpkzazx2s3qnliiigy39zk96";
+ version = "0.11.1.2";
+ sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -207331,8 +208575,8 @@ self: {
}:
mkDerivation {
pname = "text-format-heavy";
- version = "0.1.5.1";
- sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd";
+ version = "0.1.5.2";
+ sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5";
libraryHaskellDepends = [
base bytestring containers data-default parsec text time
];
@@ -207819,6 +209063,8 @@ self: {
pname = "text-show";
version = "3.7.5";
sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r";
+ revision = "1";
+ editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws";
libraryHaskellDepends = [
array base base-compat-batteries bifunctors bytestring
bytestring-builder containers contravariant generic-deriving
@@ -211403,22 +212649,21 @@ self: {
}) {};
"toodles" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs
- , directory, filepath, http-types, megaparsec, MissingH
- , regex-posix, servant, servant-blaze, servant-server, strict, text
- , transformers, wai, warp, yaml
+ ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory
+ , megaparsec, MissingH, regex-posix, servant, servant-blaze
+ , servant-server, strict, text, wai, warp, yaml
}:
mkDerivation {
pname = "toodles";
- version = "0.1.0.9";
- sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7";
+ version = "0.1.2";
+ sha256 = "0s4smdh8y308a6bwp21k070qc1xnzabab6hv2wrrmdkmmc36wfws";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- aeson base blaze-html bytestring cmdargs directory filepath
- http-types megaparsec MissingH regex-posix servant servant-blaze
- servant-server strict text transformers wai warp yaml
+ aeson base blaze-html cmdargs directory megaparsec MissingH
+ regex-posix servant servant-blaze servant-server strict text wai
+ warp yaml
];
description = "Manage the TODO entries in your code";
license = stdenv.lib.licenses.mit;
@@ -211951,8 +213196,10 @@ self: {
}:
mkDerivation {
pname = "traildb";
- version = "0.1.4.0";
- sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b";
+ version = "0.1.4.1";
+ sha256 = "1h3pscbxjl3cpcxbch4ydiv6y5j54k99v8kq61jv01gv1vjisd2r";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base bytestring containers directory exceptions primitive
profunctors text time transformers unix vector
@@ -212621,8 +213868,8 @@ self: {
pname = "tree-diff";
version = "0.0.1";
sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
- revision = "5";
- editedCabalFile = "1rj2n9d6mmk6zijnlc0q72s2qs8hhwhf25gpqqswaiqhbbh7gxi2";
+ revision = "6";
+ editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -215232,8 +216479,8 @@ self: {
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
pname = "typenums";
- version = "0.1.2";
- sha256 = "1729iws0m6xr8y5aqcrxv4br1ihvly6fagkkgfp9kj71a5jzaw7l";
+ version = "0.1.2.1";
+ sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Type level numbers using existing Nat functionality";
@@ -216497,22 +217744,6 @@ self: {
}) {};
"union" = callPackage
- ({ mkDerivation, base, criterion, deepseq, lens, profunctors
- , tagged, vinyl
- }:
- mkDerivation {
- pname = "union";
- version = "0.1.1.2";
- sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
- revision = "5";
- editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj";
- libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
- benchmarkHaskellDepends = [ base criterion deepseq lens ];
- description = "Extensible type-safe unions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "union_0_1_2" = callPackage
({ mkDerivation, base, criterion, deepseq, hashable, lens
, profunctors, tagged, vinyl
}:
@@ -216526,7 +217757,6 @@ self: {
benchmarkHaskellDepends = [ base criterion deepseq lens ];
description = "Extensible type-safe unions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"union-find" = callPackage
@@ -217024,7 +218254,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "universum_1_4_0" = callPackage
+ "universum_1_5_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, microlens
, microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -217032,8 +218262,8 @@ self: {
}:
mkDerivation {
pname = "universum";
- version = "1.4.0";
- sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk";
+ version = "1.5.0";
+ sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable microlens
microlens-mtl mtl safe-exceptions stm text transformers
@@ -217886,8 +219116,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
mkDerivation {
pname = "uri-bytestring-aeson";
- version = "0.1.0.6";
- sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq";
+ version = "0.1.0.7";
+ sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y";
libraryHaskellDepends = [
aeson base bytestring text uri-bytestring
];
@@ -218147,7 +219377,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "urlpath_9_0_0_1" = callPackage
+ "urlpath_9_0_1" = callPackage
({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
, monad-control, monad-control-aligned, monad-logger, mtl, path
, path-extra, resourcet, split, strict, text, transformers
@@ -218155,8 +219385,8 @@ self: {
}:
mkDerivation {
pname = "urlpath";
- version = "9.0.0.1";
- sha256 = "009836gw2gmmjb08nqqdklpr967gfnnnk1r5lpy3wjyspky03vgv";
+ version = "9.0.1";
+ sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg";
libraryHaskellDepends = [
attoparsec-uri base exceptions mmorph monad-control
monad-control-aligned monad-logger mtl path path-extra resourcet
@@ -219964,6 +221194,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector-binary-instances_0_2_5_1" = callPackage
+ ({ mkDerivation, base, binary, bytestring, deepseq, gauge, tasty
+ , tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "vector-binary-instances";
+ version = "0.2.5.1";
+ sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
+ libraryHaskellDepends = [ base binary vector ];
+ testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+ benchmarkHaskellDepends = [
+ base binary bytestring deepseq gauge vector
+ ];
+ description = "Instances of Data.Binary for vector";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-buffer" = callPackage
({ mkDerivation, base, deepseq, vector }:
mkDerivation {
@@ -221202,25 +222450,27 @@ self: {
"voicebase" = callPackage
({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL
- , http-client, http-client-openssl, json-autotype, lens, mime-types
- , optparse-applicative, text, wreq
+ , hspec, http-client, http-client-openssl, lens, lens-aeson
+ , mime-types, mtl, optparse-applicative, roundtrip, roundtrip-aeson
+ , text, wreq
}:
mkDerivation {
pname = "voicebase";
- version = "0.1.1.4";
- sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78";
+ version = "0.2.0.0";
+ sha256 = "0ih0z27vz7767gr11lz227vb84i2kwc6wn9z1yd0zma5nj8x73hw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring HsOpenSSL http-client http-client-openssl
- json-autotype lens mime-types text wreq
+ lens lens-aeson mime-types mtl roundtrip roundtrip-aeson text wreq
];
executableHaskellDepends = [
aeson base bytestring filepath mime-types optparse-applicative text
];
- testHaskellDepends = [ aeson base ];
+ testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
description = "Upload audio files to voicebase to get a transcription";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"void" = callPackage
@@ -221377,7 +222627,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_25" = callPackage
+ "vty_5_25_1" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, deepseq, directory, filepath, hashable, HUnit, microlens
, microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -221388,8 +222638,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.25";
- sha256 = "1m37q8l4ynnhyln1hkwxrmgysslb5d6nvnvx667q4q004dhrcr91";
+ version = "5.25.1";
+ sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221504,6 +222754,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "waargonaut" = callPackage
+ ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal
+ , cabal-doctest, containers, contravariant, digit, directory
+ , distributive, doctest, errors, filepath, generics-sop, hedgehog
+ , hoist-error, hw-balancedparens, hw-bits, hw-json, hw-prim
+ , hw-rankselect, lens, mmorph, mtl, nats, parsers, scientific
+ , semigroups, tagged, tasty, tasty-expected-failure, tasty-hedgehog
+ , tasty-hunit, template-haskell, text, transformers, vector
+ , witherable, wl-pprint-annotated, zippers
+ }:
+ mkDerivation {
+ pname = "waargonaut";
+ version = "0.1.0.0";
+ sha256 = "0y3h1kgh7n639h714ji4fycj6b8vcsa79jfv36w995p9gbjxxdjc";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bifunctors bytestring containers contravariant digit
+ distributive errors generics-sop hoist-error hw-balancedparens
+ hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats parsers
+ scientific semigroups tagged text transformers vector witherable
+ wl-pprint-annotated zippers
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring digit directory distributive doctest
+ filepath generics-sop hedgehog lens scientific semigroups tagged
+ tasty tasty-expected-failure tasty-hedgehog tasty-hunit
+ template-haskell text vector zippers
+ ];
+ description = "JSON wrangling";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wacom-daemon" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, Glob, libnotify, process, select, text, udev
@@ -224032,6 +225315,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "web3_0_8_1_0" = callPackage
+ ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
+ , cryptonite, data-default, exceptions, generics-sop, hspec
+ , hspec-contrib, hspec-discover, hspec-expectations, http-client
+ , http-client-tls, machines, memory, microlens, microlens-aeson
+ , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random
+ , relapse, secp256k1-haskell, split, stm, tagged, template-haskell
+ , text, time, transformers, vinyl
+ }:
+ mkDerivation {
+ pname = "web3";
+ version = "0.8.1.0";
+ sha256 = "0aliq3iblnlz7waswzprb8z28v82sjq8qpc2bbcyknmpp52p2r26";
+ libraryHaskellDepends = [
+ aeson async base basement bytestring cereal cryptonite data-default
+ exceptions generics-sop http-client http-client-tls machines memory
+ microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+ parsec relapse secp256k1-haskell tagged template-haskell text
+ transformers vinyl
+ ];
+ testHaskellDepends = [
+ aeson async base basement bytestring cereal cryptonite data-default
+ exceptions generics-sop hspec hspec-contrib hspec-discover
+ hspec-expectations http-client http-client-tls machines memory
+ microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+ parsec random relapse secp256k1-haskell split stm tagged
+ template-haskell text time transformers vinyl
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Ethereum API for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"webapi" = callPackage
({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
, bytestring-lexing, bytestring-trie, case-insensitive, containers
@@ -225159,14 +226476,12 @@ self: {
({ mkDerivation, base, bytestring, deepseq, dnsapi }:
mkDerivation {
pname = "windns";
- version = "0.1.0.0";
- sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
- revision = "3";
- editedCabalFile = "0j6gqyvhv7hxm5n249nrv0d9r41qb0yc4qdrzkjgs6lchndi6mrp";
+ version = "0.1.0.1";
+ sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";
libraryHaskellDepends = [ base bytestring deepseq ];
librarySystemDepends = [ dnsapi ];
- description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
- license = stdenv.lib.licenses.gpl3;
+ description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library";
+ license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {dnsapi = null;};
@@ -225419,6 +226734,7 @@ self: {
executableHaskellDepends = [ base bytestring network unix ];
description = "A network server to show bottlenecks of GHC";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wizard" = callPackage
@@ -226351,6 +227667,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "writer-cps-exceptions" = callPackage
+ ({ mkDerivation, base, exceptions, transformers
+ , writer-cps-transformers
+ }:
+ mkDerivation {
+ pname = "writer-cps-exceptions";
+ version = "0.1.0.0";
+ sha256 = "1s44h5d0f847w3j65frvjq2g6khz2ipsch109qnq5h2vcbgxid4v";
+ libraryHaskellDepends = [
+ base exceptions transformers writer-cps-transformers
+ ];
+ description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"writer-cps-full" = callPackage
({ mkDerivation, base, writer-cps-lens, writer-cps-morph
, writer-cps-mtl, writer-cps-transformers
@@ -226473,6 +227804,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ws_0_0_5" = callPackage
+ ({ mkDerivation, async, attoparsec, attoparsec-uri, base
+ , bytestring, exceptions, haskeline, mtl, network
+ , optparse-applicative, strict, text, vector, websockets, wuss
+ }:
+ mkDerivation {
+ pname = "ws";
+ version = "0.0.5";
+ sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async attoparsec-uri base bytestring exceptions haskeline mtl
+ network text websockets wuss
+ ];
+ executableHaskellDepends = [
+ async attoparsec attoparsec-uri base bytestring exceptions
+ haskeline mtl network optparse-applicative strict text vector
+ websockets wuss
+ ];
+ description = "A simple CLI utility for interacting with a websocket";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ws-chans" = callPackage
({ mkDerivation, async, base, http-types, HUnit, network
, QuickCheck, quickcheck-instances, test-framework
@@ -226949,6 +228305,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "x509_1_7_5" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+ , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+ , tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "x509";
+ version = "1.7.5";
+ sha256 = "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-parse asn1-types base bytestring containers
+ cryptonite hourglass memory mtl pem
+ ];
+ testHaskellDepends = [
+ asn1-types base bytestring cryptonite hourglass mtl tasty
+ tasty-quickcheck
+ ];
+ description = "X509 reader and writer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"x509-store" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
, containers, cryptonite, directory, filepath, mtl, pem, tasty
@@ -226967,6 +228345,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "x509-store_1_6_7" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+ , containers, cryptonite, directory, filepath, mtl, pem, tasty
+ , tasty-hunit, x509
+ }:
+ mkDerivation {
+ pname = "x509-store";
+ version = "1.6.7";
+ sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types base bytestring containers cryptonite
+ directory filepath mtl pem x509
+ ];
+ testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
+ description = "X.509 collection accessing and storing methods";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"x509-system" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, mtl, pem, process, x509, x509-store
@@ -226985,21 +228382,22 @@ self: {
"x509-util" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
- , cryptonite, directory, hourglass, pem, x509, x509-store
+ , cryptonite, directory, hourglass, memory, pem, x509, x509-store
, x509-system, x509-validation
}:
mkDerivation {
pname = "x509-util";
- version = "1.6.4";
- sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb";
+ version = "1.6.5";
+ sha256 = "1d8s1aaymc0bim871cblv1jpy6vnkadxz4spd7wpr90vswkd2hl7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
asn1-encoding asn1-types base bytestring cryptonite directory
- hourglass pem x509 x509-store x509-system x509-validation
+ hourglass memory pem x509 x509-store x509-system x509-validation
];
description = "Utility for X509 certificate and chain";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"x509-validation" = callPackage
@@ -227025,6 +228423,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "x509-validation_1_6_11" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+ , containers, cryptonite, data-default-class, hourglass, memory
+ , mtl, pem, tasty, tasty-hunit, x509, x509-store
+ }:
+ mkDerivation {
+ pname = "x509-validation";
+ version = "1.6.11";
+ sha256 = "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types base bytestring containers cryptonite
+ data-default-class hourglass memory mtl pem x509 x509-store
+ ];
+ testHaskellDepends = [
+ asn1-encoding asn1-types base bytestring cryptonite
+ data-default-class hourglass memory tasty tasty-hunit x509
+ x509-store
+ ];
+ description = "X.509 Certificate and CRL validation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"x86-64bit" = callPackage
({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis
, vector
@@ -228345,8 +229766,8 @@ self: {
pname = "xmlhtml";
version = "0.2.5.2";
sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
- revision = "1";
- editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45";
+ revision = "2";
+ editedCabalFile = "1d7q7acdv72zbbqq2n0swf3ia3lz1zplni6q5r97sp2w1a3xm6hf";
libraryHaskellDepends = [
base blaze-builder blaze-html blaze-markup bytestring
bytestring-builder containers parsec text unordered-containers
@@ -228690,6 +230111,8 @@ self: {
pname = "xmonad-wallpaper";
version = "0.0.1.4";
sha256 = "0f6214kqp86xnk1zginjiprnqlj2fzcvh3w5sv3yvqg98mwdd0cg";
+ revision = "1";
+ editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
libraryHaskellDepends = [ base magic mtl random unix xmonad ];
description = "xmonad wallpaper extension";
license = stdenv.lib.licenses.lgpl3;
@@ -229630,15 +231053,14 @@ self: {
({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
mkDerivation {
pname = "yampa-canvas";
- version = "0.2.2";
- sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
- revision = "6";
- editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20";
+ version = "0.2.3";
+ sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
description = "blank-canvas frontend for Yampa";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yampa-glfw" = callPackage
@@ -229659,6 +231081,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yampa-gloss" = callPackage
+ ({ mkDerivation, base, gloss, Yampa }:
+ mkDerivation {
+ pname = "yampa-gloss";
+ version = "0.1.0.0";
+ sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base gloss Yampa ];
+ description = "A GLOSS backend for Yampa";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yampa-glut" = callPackage
({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
, Yampa-core
@@ -229696,6 +231132,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yampa-test" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-test-quickcheck
+ , normaldistribution, QuickCheck, random, Yampa
+ }:
+ mkDerivation {
+ pname = "yampa-test";
+ version = "0.1.1";
+ sha256 = "1qc1aic4apml5akq056i5c460x12hf613r1zkisshjm0na4gx5mb";
+ libraryHaskellDepends = [
+ base normaldistribution QuickCheck Yampa
+ ];
+ testHaskellDepends = [
+ base Cabal cabal-test-quickcheck QuickCheck random Yampa
+ ];
+ description = "Testing library for Yampa";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yampa2048" = callPackage
({ mkDerivation, base, gloss, random, Yampa }:
mkDerivation {
@@ -229974,24 +231429,6 @@ self: {
}) {};
"yeshql-core" = callPackage
- ({ mkDerivation, base, containers, convertible, filepath, parsec
- , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
- }:
- mkDerivation {
- pname = "yeshql-core";
- version = "4.1.0.1";
- sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
- libraryHaskellDepends = [
- base containers convertible filepath parsec template-haskell
- ];
- testHaskellDepends = [
- base containers stm tasty tasty-hunit tasty-quickcheck
- ];
- description = "YesQL-style SQL database abstraction (core)";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yeshql-core_4_1_0_2" = callPackage
({ mkDerivation, base, containers, convertible, filepath, parsec
, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
}:
@@ -230007,30 +231444,9 @@ self: {
];
description = "YesQL-style SQL database abstraction (core)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yeshql-hdbc" = callPackage
- ({ mkDerivation, base, containers, convertible, filepath, HDBC
- , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
- , template-haskell, yeshql-core
- }:
- mkDerivation {
- pname = "yeshql-hdbc";
- version = "4.1.0.1";
- sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
- libraryHaskellDepends = [
- base containers convertible filepath HDBC parsec template-haskell
- yeshql-core
- ];
- testHaskellDepends = [
- base containers HDBC stm tasty tasty-hunit tasty-quickcheck
- ];
- description = "YesQL-style SQL database abstraction (HDBC backend)";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yeshql-hdbc_4_1_0_2" = callPackage
({ mkDerivation, base, containers, convertible, filepath, HDBC
, parsec, stm, tasty, tasty-hunit, tasty-quickcheck
, template-haskell, yeshql-core
@@ -230048,7 +231464,6 @@ self: {
];
description = "YesQL-style SQL database abstraction (HDBC backend)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yeshql-postgresql-simple" = callPackage
@@ -230196,34 +231611,6 @@ self: {
}) {};
"yesod-auth" = callPackage
- ({ mkDerivation, aeson, authenticate, base, base16-bytestring
- , base64-bytestring, binary, blaze-builder, blaze-html
- , blaze-markup, bytestring, conduit, conduit-extra, containers
- , cryptonite, data-default, email-validate, file-embed, http-client
- , http-client-tls, http-conduit, http-types, memory, network-uri
- , nonce, persistent, random, safe, shakespeare, template-haskell
- , text, time, transformers, unliftio, unliftio-core
- , unordered-containers, wai, yesod-core, yesod-form
- , yesod-persistent
- }:
- mkDerivation {
- pname = "yesod-auth";
- version = "1.6.4.1";
- sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j";
- libraryHaskellDepends = [
- aeson authenticate base base16-bytestring base64-bytestring binary
- blaze-builder blaze-html blaze-markup bytestring conduit
- conduit-extra containers cryptonite data-default email-validate
- file-embed http-client http-client-tls http-conduit http-types
- memory network-uri nonce persistent random safe shakespeare
- template-haskell text time transformers unliftio unliftio-core
- unordered-containers wai yesod-core yesod-form yesod-persistent
- ];
- description = "Authentication for Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-auth_1_6_5" = callPackage
({ mkDerivation, aeson, authenticate, base, base16-bytestring
, base64-bytestring, binary, blaze-builder, blaze-html
, blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -230249,7 +231636,6 @@ self: {
];
description = "Authentication for Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-auth-account" = callPackage
@@ -230782,42 +232168,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, byteable, bytestring, case-insensitive, cereal
- , clientsession, conduit, conduit-extra, containers, cookie
- , deepseq, fast-logger, gauge, hspec, hspec-expectations
- , http-types, HUnit, monad-logger, mtl, network, parsec
- , path-pieces, primitive, random, resourcet, rio, shakespeare
- , streaming-commons, template-haskell, text, time, transformers
- , unix-compat, unliftio, unordered-containers, vector, wai
- , wai-extra, wai-logger, warp, word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.8";
- sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup byteable bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq fast-logger http-types monad-logger mtl
- parsec path-pieces primitive random resourcet rio shakespeare
- template-haskell text time transformers unix-compat unliftio
- unordered-containers vector wai wai-extra wai-logger warp word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces random resourcet shakespeare streaming-commons
- template-haskell text transformers unliftio wai wai-extra warp
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_8_1" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, byteable, bytestring, case-insensitive, cereal
, clientsession, conduit, conduit-extra, containers, cookie
@@ -230851,7 +232201,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud" = callPackage
@@ -231113,28 +232462,6 @@ self: {
}) {};
"yesod-form" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
- , blaze-markup, byteable, bytestring, containers, data-default
- , email-validate, hspec, network-uri, persistent, resourcet
- , semigroups, shakespeare, text, time, transformers, wai
- , xss-sanitize, yesod-core, yesod-persistent
- }:
- mkDerivation {
- pname = "yesod-form";
- version = "1.6.2";
- sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057";
- libraryHaskellDepends = [
- aeson attoparsec base blaze-builder blaze-html blaze-markup
- byteable bytestring containers data-default email-validate
- network-uri persistent resourcet semigroups shakespeare text time
- transformers wai xss-sanitize yesod-core yesod-persistent
- ];
- testHaskellDepends = [ base hspec text time ];
- description = "Form handling support for Yesod Web Framework";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-form_1_6_3" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
, blaze-markup, byteable, bytestring, containers, data-default
, email-validate, hspec, network-uri, persistent, resourcet
@@ -231154,7 +232481,6 @@ self: {
testHaskellDepends = [ base hspec text time ];
description = "Form handling support for Yesod Web Framework";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-form-bootstrap4" = callPackage
@@ -231520,27 +232846,6 @@ self: {
}) {};
"yesod-persistent" = callPackage
- ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
- , persistent-sqlite, persistent-template, resource-pool, resourcet
- , text, transformers, wai-extra, yesod-core
- }:
- mkDerivation {
- pname = "yesod-persistent";
- version = "1.6.0";
- sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2";
- libraryHaskellDepends = [
- base blaze-builder conduit persistent persistent-template
- resource-pool resourcet transformers yesod-core
- ];
- testHaskellDepends = [
- base blaze-builder conduit hspec persistent persistent-sqlite text
- wai-extra yesod-core
- ];
- description = "Some helpers for using Persistent from Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-persistent_1_6_0_1" = callPackage
({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
, persistent-sqlite, persistent-template, resource-pool, resourcet
, text, transformers, wai-extra, yesod-core
@@ -231559,7 +232864,6 @@ self: {
];
description = "Some helpers for using Persistent from Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-platform" = callPackage
@@ -231808,6 +233112,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yesod-recaptcha2_0_3_0" = callPackage
+ ({ mkDerivation, aeson, base, classy-prelude, http-conduit
+ , yesod-auth, yesod-core, yesod-form
+ }:
+ mkDerivation {
+ pname = "yesod-recaptcha2";
+ version = "0.3.0";
+ sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc";
+ libraryHaskellDepends = [
+ aeson base classy-prelude http-conduit yesod-auth yesod-core
+ yesod-form
+ ];
+ description = "yesod recaptcha2";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-routes" = callPackage
({ mkDerivation, base, bytestring, containers, hspec, HUnit
, path-pieces, template-haskell, text, vector
@@ -231985,40 +233306,6 @@ self: {
}) {};
"yesod-static" = callPackage
- ({ mkDerivation, async, attoparsec, base, base64-bytestring
- , blaze-builder, byteable, bytestring, conduit, containers
- , cryptonite, cryptonite-conduit, css-text, data-default, directory
- , exceptions, file-embed, filepath, hashable, hjsmin, hspec
- , http-types, HUnit, memory, mime-types, old-time, process
- , resourcet, template-haskell, text, transformers, unix-compat
- , unordered-containers, wai, wai-app-static, wai-extra, yesod-core
- , yesod-test
- }:
- mkDerivation {
- pname = "yesod-static";
- version = "1.6.0";
- sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx";
- libraryHaskellDepends = [
- async attoparsec base base64-bytestring blaze-builder byteable
- bytestring conduit containers cryptonite cryptonite-conduit
- css-text data-default directory exceptions file-embed filepath
- hashable hjsmin http-types memory mime-types old-time process
- resourcet template-haskell text transformers unix-compat
- unordered-containers wai wai-app-static yesod-core
- ];
- testHaskellDepends = [
- async base base64-bytestring byteable bytestring conduit containers
- cryptonite cryptonite-conduit data-default directory exceptions
- file-embed filepath hjsmin hspec http-types HUnit memory mime-types
- old-time process resourcet template-haskell text transformers
- unix-compat unordered-containers wai wai-app-static wai-extra
- yesod-core yesod-test
- ];
- description = "Static file serving subsite for Yesod Web Framework";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-static_1_6_0_1" = callPackage
({ mkDerivation, async, attoparsec, base, base64-bytestring
, blaze-builder, bytestring, conduit, containers, cryptonite
, cryptonite-conduit, css-text, data-default, directory, file-embed
@@ -232048,7 +233335,6 @@ self: {
];
description = "Static file serving subsite for Yesod Web Framework";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-static-angular" = callPackage
@@ -232131,31 +233417,6 @@ self: {
}) {};
"yesod-test" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
- , bytestring, case-insensitive, conduit, containers, cookie, hspec
- , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
- , semigroups, text, time, transformers, unliftio, wai, wai-extra
- , xml-conduit, xml-types, yesod-core, yesod-form
- }:
- mkDerivation {
- pname = "yesod-test";
- version = "1.6.5";
- sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my";
- libraryHaskellDepends = [
- attoparsec base blaze-builder blaze-html bytestring
- case-insensitive conduit containers cookie hspec-core html-conduit
- http-types HUnit network pretty-show semigroups text time
- transformers wai wai-extra xml-conduit xml-types yesod-core
- ];
- testHaskellDepends = [
- base bytestring containers hspec html-conduit http-types HUnit text
- unliftio wai wai-extra xml-conduit yesod-core yesod-form
- ];
- description = "integration testing for WAI/Yesod Applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-test_1_6_5_1" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
, bytestring, case-insensitive, conduit, containers, cookie, hspec
, hspec-core, html-conduit, http-types, HUnit, network, pretty-show
@@ -232178,7 +233439,6 @@ self: {
];
description = "integration testing for WAI/Yesod Applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-test-json" = callPackage
@@ -232960,6 +234220,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yoda" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "yoda";
+ version = "0.1.0.0";
+ sha256 = "1p8zvxf63fbj2dpp3pa9awq1jc0makyka42j1aqsljfp08nx4pzn";
+ libraryHaskellDepends = [ base ];
+ description = "Parser combinators for young padawans";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yoga" = callPackage
({ mkDerivation, base, bindings-DSL, ieee754 }:
mkDerivation {
@@ -233389,8 +234661,8 @@ self: {
}:
mkDerivation {
pname = "zephyr";
- version = "0.2.0";
- sha256 = "0n0z7s71gjlpra4ghfd51rcz5yqddzzwfdpjnhlxciakrabc5m3f";
+ version = "0.2.1";
+ sha256 = "0yhpy1dwh1axbh3xgxn97vnh616pywz56r7gy6sfvqaxj9bqviha";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -233928,6 +235200,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zip-stream_0_2_0_1" = callPackage
+ ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit
+ , conduit-extra, digest, directory, exceptions, filepath, mtl
+ , primitive, resourcet, text, time, transformers, transformers-base
+ , zlib
+ }:
+ mkDerivation {
+ pname = "zip-stream";
+ version = "0.2.0.1";
+ sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary binary-conduit bytestring conduit conduit-extra digest
+ exceptions mtl primitive resourcet text time transformers-base zlib
+ ];
+ executableHaskellDepends = [
+ base bytestring conduit conduit-extra directory filepath resourcet
+ text time transformers
+ ];
+ description = "ZIP archive streaming using conduits";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zipedit" = callPackage
({ mkDerivation, base, directory, mtl, process }:
mkDerivation {
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 6155e158e9d..942163ea209 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -245,12 +245,13 @@ rec {
on hackage. This can be used as a test for the source distribution,
assuming the build fails when packaging mistakes are in the cabal file.
*/
- buildFromSdist = pkg: lib.overrideDerivation pkg (drv: {
- unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
- echo "Source tarball is at ${src}/${tarname}.tar.gz"
- tar xf ${src}/${tarname}.tar.gz
- cd ${pkg.pname}-*
- '';
+ buildFromSdist = pkg: overrideCabal pkg (drv: {
+ src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz";
+
+ # Revising and jailbreaking the cabal file has been handled in sdistTarball
+ revision = null;
+ editedCabalFile = null;
+ jailbreak = false;
});
/* Build the package in a strict way to uncover potential problems.
@@ -353,4 +354,19 @@ rec {
in
builtins.listToAttrs (map toKeyVal haskellPaths);
+
+ # Modify a Haskell package to add completion scripts for the given executable
+ # produced by it. These completion scripts will be picked up automatically if
+ # the resulting derivation is installed, e.g. by `nix-env -i`.
+ addOptparseApplicativeCompletionScripts = exeName: pkg: overrideCabal pkg (drv: {
+ postInstall = (drv.postInstall or "") + ''
+ bashCompDir="$out/share/bash-completion/completions"
+ zshCompDir="$out/share/zsh/vendor-completions"
+ fishCompDir="$out/share/fish/vendor_completions.d"
+ mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
+ "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}"
+ "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}"
+ "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
+ '';
+ });
}
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
index 1e234b3f693..91ee174dadf 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/pkgs/development/idris-modules/categories.nix
@@ -6,11 +6,10 @@ build-idris-package {
name = "categories";
version = "2018-07-02";
- # https://github.com/danilkolikov/categories/pull/5
src = fetchFromGitHub {
- owner = "infinisil";
+ owner = "danilkolikov";
repo = "categories";
- rev = "9722d62297e5025431e91b271ab09c5d14867236";
+ rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35";
sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2";
};
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
index 7b6cb64cfe3..7f3164f3160 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/pkgs/development/idris-modules/derive.nix
@@ -10,12 +10,11 @@ build-idris-package {
idrisDeps = [ contrib pruviloj ];
- # https://github.com/david-christiansen/derive-all-the-instances/pull/9
src = fetchFromGitHub {
- owner = "infinisil";
+ owner = "david-christiansen";
repo = "derive-all-the-instances";
- rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604";
- sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn";
+ rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950";
+ sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m";
};
meta = {
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 081f1a547d6..85794b09ae0 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchzip, gnugrep }:
stdenv.mkDerivation rec {
name = "bats-${version}";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
};
- patchPhase = "patchShebangs ./install.sh";
+ patchPhase = ''
+ patchShebangs ./install.sh
+ substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
+ '';
installPhase = "./install.sh $out";
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
index d97d416bc27..adbbbaff890 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
- version = "1.7.3";
- sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa";
+ version = "1.7.4";
+ sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
minimumOTPVersion = "19";
}
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 3f08ca8f7c2..02ce07bdf47 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -2,20 +2,20 @@
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
- sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98";
+ sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1";
};
- propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
-
- # The build generates a .json parser file in the home directory under .cache.
- # This is needed to get it to not try and open files in /homeless-shelter
- preConfigure = ''
- export HOME=$TMP
- '';
+ propagatedBuildInputs = with pythonPackages; [
+ appdirs
+ astor
+ clint
+ funcparserlib
+ rply
+ ];
meta = {
description = "A LISP dialect embedded in Python";
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 42cc2a518d6..8d21d92ef43 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -186,7 +186,7 @@ in rec {
# the latest Devel version
perldevel = common {
- version = "5.29.3";
- sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17";
+ version = "5.29.4";
+ sha256 = "153r0f6jdqrl7hxrvhfivf5g8ivhbvggfhg841q3hi3db5rc86k4";
};
}
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
deleted file mode 100644
index 18b90cd1da4..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ /dev/null
@@ -1,214 +0,0 @@
-{ stdenv, fetchurl, fetchpatch
-, bzip2
-, expat
-, libffi
-, gdbm
-, lzma
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
-, zlib
-, callPackage
-, self
-, CF, configd
-, python-setup-hook
-# For the Python package set
-, packageOverrides ? (self: super: {})
-}:
-
-assert x11Support -> tcl != null
- && tk != null
- && xproto != null
- && libX11 != null;
-
-with stdenv.lib;
-
-let
- majorVersion = "3.4";
- minorVersion = "9";
- minorVersionSuffix = "";
- version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
- libPrefix = "python${majorVersion}";
- sitePackages = "lib/${libPrefix}/site-packages";
-
- buildInputs = filter (p: p != null) [
- zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
- ++ optionals x11Support [ tcl tk libX11 xproto ]
- ++ optionals stdenv.isDarwin [ CF configd ];
-
- hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
-
-in stdenv.mkDerivation {
- name = "python3-${version}";
- pythonVersion = majorVersion;
- inherit majorVersion version;
-
- inherit buildInputs;
-
- src = fetchurl {
- url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
- sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr";
- };
-
- NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
-
- # Determinism: The interpreter is patched to write null timestamps when compiling python files.
- # This way python doesn't try to update them when we freeze timestamps in nix store.
- DETERMINISTIC_BUILD=1;
- # Determinism: We fix the hashes of str, bytes and datetime objects.
- PYTHONHASHSEED=0;
-
- prePatch = optionalString stdenv.isDarwin ''
- substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
- substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
- '';
-
- patches = [
- ./no-ldconfig.patch
- ./ld_library_path.patch
- ] ++ optionals (x11Support && stdenv.isDarwin) [
- ./use-correct-tcl-tk-on-darwin.patch
- ] ++ optionals hasDistutilsCxxPatch [
- # Fix for http://bugs.python.org/issue1222585
- # Upstream distutils is calling C compiler to compile C++ code, which
- # only works for GCC and Apple Clang. This makes distutils to call C++
- # compiler when needed.
- (fetchpatch {
- url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
- sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
- extraPrefix = "";
- })
- ];
-
- postPatch = ''
- # Determinism
- substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
- # Determinism. This is done unconditionally
- substituteInPlace "Lib/importlib/_bootstrap.py" --replace "source_mtime = int(source_stats['mtime'])" "source_mtime = 1"
- '' + optionalString (x11Support && (tix != null)) ''
- substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
- ''
- # Avoid picking up getentropy() from glibc >= 2.25, as that would break
- # on older kernels. http://bugs.python.org/issue29157
- + optionalString stdenv.isLinux ''
- substituteInPlace Python/random.c --replace 'defined(HAVE_GETENTROPY)' '0'
- cat Python/random.c
- '';
-
- CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
- LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
- LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
-
- configureFlags = [
- "--enable-shared"
- "--with-threads"
- "--without-ensurepip"
- "--with-system-expat"
- "--with-system-ffi"
- ]
- # Never even try to use lchmod on linux,
- # don't rely on detecting glibc-isms.
- ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
-
- preConfigure = ''
- for i in /usr /sw /opt /pkg; do # improve purity
- substituteInPlace ./setup.py --replace $i /no-such-path
- done
- ${optionalString stdenv.isDarwin ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
- export MACOSX_DEPLOYMENT_TARGET=10.6
- ''
- + optionalString stdenv.hostPlatform.isMusl ''
- export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
- ''}
- '';
-
- setupHook = python-setup-hook sitePackages;
-
- postInstall = ''
- # needed for some packages, especially packages that backport functionality
- # to 2.x from 3.x
- for item in $out/lib/python${majorVersion}/test/*; do
- if [[ "$item" != */test_support.py*
- && "$item" != */test/support
- && "$item" != */test/libregrtest
- && "$item" != */test/regrtest.py* ]]; then
- rm -rf "$item"
- else
- echo $item
- fi
- done
- touch $out/lib/python${majorVersion}/test/__init__.py
-
- ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
- paxmark E $out/bin/python${majorVersion}
-
- # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
- echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
- # Determinism: Windows installers were not deterministic.
- # We're also not interested in building Windows installers.
- find "$out" -name 'wininst*.exe' | xargs -r rm -f
-
- # Use Python3 as default python
- ln -s "$out/bin/idle3" "$out/bin/idle"
- ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
- ln -s "$out/bin/python3" "$out/bin/python"
- ln -s "$out/bin/python3-config" "$out/bin/python-config"
- ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-
- # Get rid of retained dependencies on -dev packages, and remove
- # some $TMPDIR references to improve binary reproducibility.
- # Note that the .pyc file of _sysconfigdata.py should be regenerated!
- for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
- sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
- done
-
- # Determinism: rebuild all bytecode
- # We exclude lib2to3 because that's Python 2 code which fails
- # We rebuild three times, once for each optimization level
- find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
- '';
-
- passthru = let
- pythonPackages = callPackage ../../../../../top-level/python-packages.nix {
- python = self;
- overrides = packageOverrides;
- };
- in rec {
- inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
- executable = "${libPrefix}m";
- buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
- withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
- pkgs = pythonPackages;
- isPy3 = true;
- isPy34 = true;
- is_py3k = true; # deprecated
- interpreter = "${self}/bin/${executable}";
- };
-
- enableParallelBuilding = true;
-
- doCheck = false; # expensive, and fails
-
- meta = {
- homepage = http://python.org;
- description = "A high-level dynamically-typed programming language";
- longDescription = ''
- Python is a remarkably powerful dynamic programming language that
- is used in a wide variety of application domains. Some of its key
- distinguishing features include: clear, readable syntax; strong
- introspection capabilities; intuitive object orientation; natural
- expression of procedural code; full modularity, supporting
- hierarchical packages; exception-based error handling; and very
- high level dynamic data types.
- '';
- license = licenses.psfl;
- platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ fridh ];
- };
-}
diff --git a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
deleted file mode 100644
index 3172eb6d18e..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 85991e0d7f0e631240f3f6233bd65d1128a66dec Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Thu, 14 Sep 2017 10:00:31 +0200
-Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH
-
-Backports support for LD_LIBRARY_PATH from 3.6
----
- Lib/ctypes/util.py | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 780cd5d21b..d7ac15070f 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -181,8 +181,32 @@ elif os.name == "posix":
- def _findSoname_ldconfig(name):
- return None
-
-+ def _findLib_ld(name):
-+ # See issue #9998 for why this is needed
-+ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
-+ cmd = ['ld', '-t']
-+ libpath = os.environ.get('LD_LIBRARY_PATH')
-+ if libpath:
-+ for d in libpath.split(':'):
-+ cmd.extend(['-L', d])
-+ cmd.extend(['-o', os.devnull, '-l%s' % name])
-+ result = None
-+ try:
-+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-+ stderr=subprocess.PIPE,
-+ universal_newlines=True)
-+ out, _ = p.communicate()
-+ res = re.search(expr, os.fsdecode(out))
-+ if res:
-+ result = res.group(0)
-+ except Exception as e:
-+ pass # result will be None
-+ return result
-+
- def find_library(name):
-- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-+ # See issue #9998
-+ return _findSoname_ldconfig(name) or \
-+ _get_soname(_findLib_gcc(name) or _findLib_ld(name))
-
- ################################################################
- # test code
---
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
deleted file mode 100644
index 3cb77a10725..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Mon, 28 Aug 2017 09:24:06 +0200
-Subject: [PATCH] Don't use ldconfig and speed up uuid load
-
----
- Lib/ctypes/util.py | 52 ++--------------------------------------------------
- Lib/uuid.py | 50 ++------------------------------------------------
- 2 files changed, 4 insertions(+), 98 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 595113bffd..780cd5d21b 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -88,28 +88,7 @@ elif os.name == "posix":
- import re, tempfile
-
- def _findLib_gcc(name):
-- expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
-- fdout, ccout = tempfile.mkstemp()
-- os.close(fdout)
-- cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
-- 'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
-- try:
-- f = os.popen(cmd)
-- try:
-- trace = f.read()
-- finally:
-- rv = f.close()
-- finally:
-- try:
-- os.unlink(ccout)
-- except FileNotFoundError:
-- pass
-- if rv == 10:
-- raise OSError('gcc or cc command not found')
-- res = re.search(expr, trace)
-- if not res:
-- return None
-- return res.group(0)
-+ return None
-
-
- if sys.platform == "sunos5":
-@@ -200,34 +179,7 @@ elif os.name == "posix":
- else:
-
- def _findSoname_ldconfig(name):
-- import struct
-- if struct.calcsize('l') == 4:
-- machine = os.uname().machine + '-32'
-- else:
-- machine = os.uname().machine + '-64'
-- mach_map = {
-- 'x86_64-64': 'libc6,x86-64',
-- 'ppc64-64': 'libc6,64bit',
-- 'sparc64-64': 'libc6,64bit',
-- 's390x-64': 'libc6,64bit',
-- 'ia64-64': 'libc6,IA-64',
-- }
-- abi_type = mach_map.get(machine, 'libc6')
--
-- # XXX assuming GLIBC's ldconfig (with option -p)
-- regex = os.fsencode(
-- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
-- try:
-- with subprocess.Popen(['/sbin/ldconfig', '-p'],
-- stdin=subprocess.DEVNULL,
-- stderr=subprocess.DEVNULL,
-- stdout=subprocess.PIPE,
-- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
-- res = re.search(regex, p.stdout.read())
-- if res:
-- return os.fsdecode(res.group(1))
-- except OSError:
-- pass
-+ return None
-
- def find_library(name):
- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 1061bffc43..846f5819f5 100644
---- a/Lib/uuid.py
-+++ b/Lib/uuid.py
-@@ -451,57 +451,11 @@ def _netbios_getnode():
- return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
- (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
-
--# Thanks to Thomas Heller for ctypes and for his help with its use here.
-
--# If ctypes is available, use it to find system routines for UUID generation.
--# XXX This makes the module non-thread-safe!
- _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
--try:
-- import ctypes, ctypes.util
-
-- # The uuid_generate_* routines are provided by libuuid on at least
-- # Linux and FreeBSD, and provided by libc on Mac OS X.
-- for libname in ['uuid', 'c']:
-- try:
-- lib = ctypes.CDLL(ctypes.util.find_library(libname))
-- except:
-- continue
-- if hasattr(lib, 'uuid_generate_random'):
-- _uuid_generate_random = lib.uuid_generate_random
-- if hasattr(lib, 'uuid_generate_time'):
-- _uuid_generate_time = lib.uuid_generate_time
-- if _uuid_generate_random is not None:
-- break # found everything we were looking for
--
-- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
-- # in issue #8621 the function generates the same sequence of values
-- # in the parent process and all children created using fork (unless
-- # those children use exec as well).
-- #
-- # Assume that the uuid_generate functions are broken from 10.5 onward,
-- # the test can be adjusted when a later version is fixed.
-- import sys
-- if sys.platform == 'darwin':
-- import os
-- if int(os.uname().release.split('.')[0]) >= 9:
-- _uuid_generate_random = _uuid_generate_time = None
--
-- # On Windows prior to 2000, UuidCreate gives a UUID containing the
-- # hardware address. On Windows 2000 and later, UuidCreate makes a
-- # random UUID and UuidCreateSequential gives a UUID containing the
-- # hardware address. These routines are provided by the RPC runtime.
-- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last
-- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
-- # to bear any relationship to the MAC address of any network device
-- # on the box.
-- try:
-- lib = ctypes.windll.rpcrt4
-- except:
-- lib = None
-- _UuidCreate = getattr(lib, 'UuidCreateSequential',
-- getattr(lib, 'UuidCreate', None))
--except:
-- pass
-+_uuid_generate_time = _UuidCreate = None
-+
-
- def _unixdll_getnode():
- """Get the hardware address on Unix using ctypes."""
---
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
deleted file mode 100644
index b73f62b97ec..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2779658..902d0eb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
- # Rather than complicate the code below, detecting and building
- # AquaTk is a separate method. Only one Tkinter will be built on
- # Darwin - either AquaTk, if it is found, or X11 based Tk.
-- if (host_platform == 'darwin' and
-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-- return
-
- # Assume we haven't found any of the libraries or include files
- # The versions with dots are used on Unix, and the versions without
-@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
- if dir not in include_dirs:
- include_dirs.append(dir)
-
-- # Check for various platform-specific directories
-- if host_platform == 'sunos5':
-- include_dirs.append('/usr/openwin/include')
-- added_lib_dirs.append('/usr/openwin/lib')
-- elif os.path.exists('/usr/X11R6/include'):
-- include_dirs.append('/usr/X11R6/include')
-- added_lib_dirs.append('/usr/X11R6/lib64')
-- added_lib_dirs.append('/usr/X11R6/lib')
-- elif os.path.exists('/usr/X11R5/include'):
-- include_dirs.append('/usr/X11R5/include')
-- added_lib_dirs.append('/usr/X11R5/lib')
-- else:
-- # Assume default location for X11
-- include_dirs.append('/usr/X11/include')
-- added_lib_dirs.append('/usr/X11/lib')
--
- # If Cygwin, then verify that X is installed before proceeding
- if host_platform == 'cygwin':
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
- if host_platform in ['aix3', 'aix4']:
- libs.append('ld')
-
-- # Finally, link with the X11 libraries (not appropriate on cygwin)
-- if host_platform != "cygwin":
-- libs.append('X11')
--
- ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
- define_macros=[('WITH_APPINIT', 1)] + defs,
- include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 1f2a28cb8fb..ee7d9dd6813 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -36,7 +36,7 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
- version = "7.0"; # always change at once with ./minimal.nix
+ version = "7.1"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit name;
- sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a";
+ sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9";
};
FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index ba4e94cbf13..114023defcd 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
- sha256 = "0ivpr1a2w1ln1lx91q11rj9wp3rbfq33acrz2gxxvd80qqaq3zyh";
+ sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711";
};
meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 7c6844fdec0..ea96e5ed334 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -10,6 +10,9 @@ in stdenv.mkDerivation rec {
sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
};
+ outputs = [ "out" "dev" ];
+ setOutputFlags = false; # Configure script only understands --includedir
+
buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
@@ -32,6 +35,7 @@ in stdenv.mkDerivation rec {
export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}"
+ configureFlagsArray+=("--includedir=$dev/include")
cd js/src
@@ -49,6 +53,12 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postInstall = ''
+ moveToOutput bin/js52-config "$dev"
+ # Nuke a static lib.
+ rm $out/lib/libjs_static.ajs
+ '';
+
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 7d8f5b2caee..d445e1ab917 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -21,11 +21,11 @@ assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
stdenv.mkDerivation rec {
name = "SDL2-${version}";
- version = "2.0.8";
+ version = "2.0.9";
src = fetchurl {
url = "https://www.libsdl.org/release/${name}.tar.gz";
- sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
+ sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index bca519c7628..f94e0a3ee78 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
- version = "2.14.0";
+ version = "2.15.1";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = "${pname}";
rev = "${version}";
- sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554";
+ sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am";
};
buildInputs = [mpir gmp mpfr flint];
configureFlags = [
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 77ce77dee5a..96259dc6694 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
# patch to fix python-test
./darwin.patch
+
+ # facebook/zstd#1385
+ ./zstd136.patch
];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch
new file mode 100644
index 00000000000..1bdeecaef99
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/zstd136.patch
@@ -0,0 +1,17 @@
+--- a/src/arrow/util/compression_zstd.cc
++++ b/src/arrow/util/compression_zstd.cc
+@@ -35,8 +35,13 @@ namespace util {
+
+ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len,
+ uint8_t* output_buffer) {
++ void *safe_output_buffer = static_cast(output_buffer);
++ int dummy {};
++ if ((output_len == 0) && (output_buffer == NULL)) {
++ safe_output_buffer = static_cast(&dummy);
++ }
+ int64_t decompressed_size =
+- ZSTD_decompress(output_buffer, static_cast(output_len), input,
++ ZSTD_decompress(safe_output_buffer, static_cast(output_len), input,
+ static_cast(input_len));
+ if (decompressed_size != output_len) {
+ return Status::IOError("Corrupt ZSTD compressed data.");
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 9afb03e0d0c..a7c918ee01a 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
else throw "Unsupported system!";
in stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
- version = "1.5.17";
+ version = "1.6.20";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
+ sha256 = "0b6ahy748i29jqzzrjh8vybk7dv8qda3ir277mqflg4a8xxg9bj1";
};
# FIXME: might be nice to put different APIs in different outputs
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 0a2badea7cb..3fcdbca34f5 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,54 +1,66 @@
-{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
-, libstartup_notification, gobjectIntrospection, gtk-doc
+{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
+, libstartup_notification, gobjectIntrospection, gtk-doc, docbook_xsl
, xorgserver, dbus, python2 }:
stdenv.mkDerivation rec {
- pname = "bamf";
- version = "0.5.3";
- name = "${pname}-${version}";
+ name = "bamf-2018-02-07";
outputs = [ "out" "dev" "devdoc" ];
- src = fetchurl {
- url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
- sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
+ src = fetchgit {
+ url = https://git.launchpad.net/~unity-team/bamf;
+ rev = "0.5.3+18.04.20180207.2-0ubuntu1";
+ sha256 = "0hvbgzi0mzzzvcamd9mi1ykbk2l6zxffspyk5fpik8bij56nhzym";
};
nativeBuildInputs = [
- pkgconfig
- gtk-doc
+ autoconf
+ automake
+ docbook_xsl
+ gnome3.gnome-common
gobjectIntrospection
+ gtk-doc
+ libtool
+ pkgconfig
vala
+ which
# Tests
- xorgserver
+ python2
+ python2.pkgs.libxslt
+ python2.pkgs.libxml2
dbus
- (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
+ xorgserver
];
buildInputs = [
- libgtop
- libwnck3
- libstartup_notification
glib
+ libgtop
+ libstartup_notification
+ libwnck3
];
# Fix hard-coded path
# https://bugs.launchpad.net/bamf/+bug/1780557
postPatch = ''
- substituteInPlace data/Makefile.in \
+ substituteInPlace data/Makefile.am \
--replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
'';
configureFlags = [
"--enable-headless-tests"
+ "--enable-gtk-doc"
];
# fix paths
makeFlags = [
- "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
];
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
# TODO: Requires /etc/machine-id
doCheck = false;
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index e5e3c2d662c..a88b3f1b9b6 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "19.13";
+ version = "19.16";
name = "dlib-${version}";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3";
+ sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p";
};
postPatch = ''
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
new file mode 100644
index 00000000000..8cc7a0bba62
--- /dev/null
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "dqlite-${version}";
+ version = "0.2.4";
+
+ src = fetchFromGitHub {
+ owner = "CanonicalLtd";
+ repo = "dqlite";
+ rev = "v${version}";
+ sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ libuv sqlite-replication ];
+
+ meta = {
+ description = "Expose a SQLite database over the network and replicate it across a cluster of peers";
+ homepage = https://github.com/CanonicalLtd/dqlite/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ joko ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 01600f90f28..23d20f418c3 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -3,7 +3,7 @@
, enablePython ? false, pythonPackages
, enablePosixThreads ? false
, enableOpenMPThreads ? false}:
-with stdenv.lib;
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "eccodes-${version}";
version = "2.9.0";
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
};
+ postPatch = ''
+ substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir}
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [ netcdf
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index dc44c7d8705..90e3ee9af5b 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
- dontDisableStatic = true;
+ outputs = [ "out" "dev" "man" "doc" ];
meta = with stdenv.lib; {
homepage = http://troglobit.com/editline.html;
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index e6d13a5915a..e3367f661ca 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fetchpatch, cmake}:
let
- version = "3.3.4";
+ version = "3.3.5";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@@ -9,18 +9,9 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
- sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
+ sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
};
- patches = [
- # Remove for > 3.3.4
- # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler"
- (fetchpatch {
- url = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw";
- sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1";
- })
- ];
-
nativeBuildInputs = [ cmake ];
postInstall = ''
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7c3b3447d61..d11ef732a01 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
+, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex
, openglSupport ? false, libGLU_combined ? null
# Build options
@@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
"--enable-libtheora"
(ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
+ (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm"))
"--enable-vdpau"
"--enable-libvorbis"
(ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
@@ -165,6 +166,7 @@ stdenv.mkDerivation rec {
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
+ ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index c120f7c9b43..fbe947e3afb 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -3,29 +3,41 @@
stdenv.mkDerivation rec {
version = "5.2.1";
name = "fmt-${version}";
+
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = "${version}";
sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
};
+
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DFMT_TEST=TRUE"
+ "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}"
+ ];
+
+ enableParallelBuilding = true;
+
doCheck = true;
# preCheckHook ensures the test binaries can find libfmt.so.5
preCheck = if enableShared
then "export LD_LIBRARY_PATH=\"$PWD\""
else "";
- cmakeFlags = [ "-DFMT_TEST=yes"
- "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ];
+
meta = with stdenv.lib; {
- homepage = http://fmtlib.net/;
description = "Small, safe and fast formatting library";
longDescription = ''
fmt (formerly cppformat) is an open-source formatting library. It can be
used as a fast and safe alternative to printf and IOStreams.
'';
+ homepage = http://fmtlib.net/;
+ downloadPage = https://github.com/fmtlib/fmt/;
maintainers = [ maintainers.jdehaas ];
license = licenses.bsd2;
- platforms = platforms.unix;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 9694765bb93..1598dafaad0 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent
-, double-conversion, glog, google-gflags, python, libiberty, openssl }:
+{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
+, google-gflags, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-${version}";
- version = "2018.08.27.00";
+ version = "2018.10.29.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz";
+ sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab";
};
- nativeBuildInputs = [ autoreconfHook python pkgconfig ];
- buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ];
+ nativeBuildInputs = [ cmake ];
- postPatch = "cd folly";
- preBuild = ''
- patchShebangs build
- '';
-
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+ # See CMake/folly-deps.cmake in the Folly source tree.
+ buildInputs = [
+ boost
+ double-conversion
+ glog
+ google-gflags
+ libevent
+ libiberty
+ openssl
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
new file mode 100644
index 00000000000..68f3c9d0ee5
--- /dev/null
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, libtool, ghostscript, groff }:
+
+stdenv.mkDerivation rec {
+ name = "fstrcmp-${version}";
+ version = "0.7";
+
+ src = fetchzip {
+ url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz";
+ sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a";
+ };
+
+ outputs = [ "out" "dev" "doc" "man" "devman" ];
+
+ nativeBuildInputs = [ libtool ghostscript groff ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Make fuzzy comparisons of strings and byte arrays";
+ longDescription = ''
+ The fstrcmp project provides a library that is used to make fuzzy
+ comparisons of strings and byte arrays, including multi-byte character
+ strings.
+ '';
+ homepage = http://fstrcmp.sourceforge.net/;
+ downloadPage = https://sourceforge.net/projects/fstrcmp/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.sephalon ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a7a4c2fbacd..b77c450bdec 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -133,7 +133,9 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ];
- buildInputs = lib.optionals withGd [ gd libpng ];
+ # TODO make linuxHeaders unconditional next mass rebuild
+ buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders
+ ++ lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
# prevent a retained dependency on the bootstrap tools in the stdenv-linux
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 65c99610a5c..63d00f1dd1a 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
stdenv.mkDerivation rec {
- version = "3.2.0";
+ version = "3.2.1";
name = "gmime-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
- sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m";
+ sha256 = "0q65nalxzpyjg37gdlpj9v6028wp0qx47z96q0ff6znw217nzzjn";
};
outputs = [ "out" "dev" ];
- buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
+ buildInputs = [ gobjectIntrospection zlib gpgme libidn2 libunistring ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib ];
configureFlags = [ "--enable-introspection=yes" ];
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
checkInputs = [ gnupg ];
+ doCheck = true;
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 1ee0970ffad..6892ea6364d 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }:
stdenv.mkDerivation rec {
- name = "granite-${version}";
- version = "5.1.0";
+ pname = "granite";
+ version = "5.2.0";
+
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "elementary";
- repo = "granite";
+ repo = pname;
rev = version;
sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40";
};
@@ -21,10 +23,10 @@ stdenv.mkDerivation rec {
gettext
gobjectIntrospection
ninja
- perl
pkgconfig
- vala_0_40
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
];
+
buildInputs = [
glib
gnome3.libgee
@@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An extension to GTK+ used by elementary OS";
- longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";
+ longDescription = ''
+ Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions
+ designed for use in apps built for elementary OS.
+ '';
homepage = https://github.com/elementary/granite;
- license = licenses.lgpl3;
+ license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ vozz worldofpeace ];
};
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index a21e2aacde2..f4145c85199 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
rm -vf BUILD
'';
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
+
enableParallelBuilds = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 71da2c716f8..a1df933149f 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-gssapi-impl=mit" ];
- doCheck = true;
+ doCheck = !stdenv.hostPlatform.isDarwin;
meta = {
description = "GNU SASL, Simple Authentication and Security Layer library";
diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch
new file mode 100644
index 00000000000..0aa2034e399
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/conf.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index cb1e0df..d90c85c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -95,6 +95,6 @@ endif
+ configure_file(
+ input: 'gsignond.conf.in',
+ configuration: conf_data,
+- install_dir: sysconf_dir,
++ install_dir: 'etc/',
+ output: 'gsignond.conf'
+ )
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
new file mode 100644
index 00000000000..11dcc2a2ee9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
+, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl
+, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
+, symlinkJoin, gsignondPlugins, plugins }:
+
+let
+unwrapped = stdenv.mkDerivation rec {
+ pname = "gsignond";
+ version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
+
+ name = "${pname}-2018-10-04";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = pname;
+ rev = version;
+ sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
+ };
+
+ nativeBuildInputs = [
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ libsecret
+ ];
+
+ propagatedBuildInputs = [ sqlite ];
+
+ mesonFlags = [
+ "-Dbus_type=session"
+ "-Dextension=desktop"
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ patches = [
+ ./conf.patch
+ ./plugin-load-env.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "D-Bus service which performs user authentication on behalf of its clients";
+ homepage = https://gitlab.com/accounts-sso/gsignond;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+};
+
+in if plugins == [] then unwrapped
+ else import ./wrapper.nix {
+ inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins;
+ gsignond = unwrapped;
+ }
+
diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch
new file mode 100644
index 00000000000..5da2b4c157e
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch
@@ -0,0 +1,35 @@
+diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
+index 5497b32..979e1b4 100644
+--- a/src/gplugind/gsignond-plugin-loader.c
++++ b/src/gplugind/gsignond-plugin-loader.c
+@@ -38,11 +38,10 @@ gsignond_load_plugin (
+ gchar *plugin_filename;
+ GSignondPlugin *plugin;
+
+-# ifdef ENABLE_DEBUG
+ const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+ if (env_val)
+ plugin_path = env_val;
+-# endif
++
+ plugin_filename = g_module_build_path (plugin_path, plugin_type);
+ plugin = gsignond_load_plugin_with_filename (plugin_type,
+ plugin_filename);
+diff --git a/src/gplugind/main.c b/src/gplugind/main.c
+index 1c6cdb6..c85c623 100644
+--- a/src/gplugind/main.c
++++ b/src/gplugind/main.c
+@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
+ static const gchar* _plugin_path(void)
+ {
+ const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
+-# ifdef ENABLE_DEBUG
++
+ const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+ if (env_val)
+ plugin_path = env_val;
+-# endif
++
+ return plugin_path;
+ }
+
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
new file mode 100644
index 00000000000..a23c1487881
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-lastfm-${version}";
+ version = "2018-05-07";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-lastfm";
+ rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c";
+ sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ gsignond
+ json-glib
+ libsoup
+ ];
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
new file mode 100644
index 00000000000..763e76c9cc9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-mail-${version}";
+ version = "2018-10-04";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-mail";
+ rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
+ sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ gsignond
+ ];
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
new file mode 100644
index 00000000000..ee45430122c
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check
+, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
+, docbook_xsl, glibcLocales, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-oauth-${version}";
+ version = "2018-10-15";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-oa";
+ rev = "d471cebfd7c50567b1244277a9559f18f8d58691";
+ sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ glib
+ gnutls
+ gsignond
+ json-glib
+ libsoup
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
new file mode 100644
index 00000000000..25f20557906
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
+, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-sasl-${version}";
+ version = "2018-10-15";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-sasl";
+ rev = "b304c70b7dad9368b23b1205122d10de684c896a";
+ sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ glib
+ gsasl
+ gsignond
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix
new file mode 100644
index 00000000000..a5df6bbeafb
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/wrapper.nix
@@ -0,0 +1,23 @@
+{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }:
+
+symlinkJoin {
+ name = "gsignond-with-plugins-${gsignond.version}";
+
+ paths = [ gsignond ] ++ plugins;
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/gsignond \
+ --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins"
+
+ rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service
+ rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
+
+ substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \
+ --replace ${gsignond} $out
+
+ substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
+ --replace ${gsignond} $out
+ '';
+}
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 769cc1c768c..cf4069871d1 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, ninja, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "gtest-${version}";
version = "1.8.1";
@@ -10,24 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
};
- buildInputs = [ cmake ];
-
- configurePhase = ''
- mkdir build
- cd build
- cmake ../ -DCMAKE_INSTALL_PREFIX=$out
- '';
-
- installPhase = ''
- mkdir -p $out/lib
- cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
- ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
- mkdir -p $out/include
- cp -v -r ../googlemock/include/gmock $out/include
- cp -v -r ../googletest/include/gtest $out/include
- mkdir -p $out/src
- cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
- '';
+ nativeBuildInputs = [ cmake ninja ];
meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests";
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 4da9db3ef04..f445f90f308 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,30 +1,38 @@
-{stdenv, fetchurl
-, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1, vala_0_38
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection
+, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
+, glib, systemd, libusb1, vala, hwdata
}:
stdenv.mkDerivation rec {
name = "gusb-${version}";
- version = "0.2.11";
- enableParallelBuilding = true;
+ version = "0.3.0";
+
+ outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
- sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";
+ sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq";
};
- preConfigure = "./autogen.sh";
-
- nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext
- gobjectIntrospection libxslt vala_0_38 ];
- buildInputs = [ systemd glib ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext
+ gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
+ gobjectIntrospection vala
+ ];
+ buildInputs = [ systemd glib ];
propagatedBuildInputs = [ libusb1 ];
- meta = {
+ mesonFlags = [
+ "-Dusb_ids=${hwdata}/share/hwdata/usb.ids"
+ ];
+
+ doCheck = false; # tests try to access USB
+
+ meta = with stdenv.lib; {
description = "GLib libusb wrapper";
- homepage = https://people.freedesktop.org/~hughsient/releases/;
- license = stdenv.lib.licenses.lgpl21;
- maintainers = [stdenv.lib.maintainers.marcweber];
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://github.com/hughsie/libgusb;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.marcweber ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 5d4eae4e063..02d76700068 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:
+{ stdenv, fetchurl }:
let
version = "2.8.1";
@@ -10,38 +10,18 @@ in stdenv.mkDerivation {
sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai";
};
+ NIX_CFLAGS_COMPILE = "-Wno-error";
patches = [ ./build-shared.patch ];
+ makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
+ buildFlags = "library";
+ doCheck = true;
+ checkTarget = "test";
- configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp";
-
- buildFlags = [ "BUILDTYPE=Release" ];
-
- buildInputs =
- [ python2Packages.gyp ]
- ++ stdenv.lib.optional stdenv.isLinux utillinux
- ++ stdenv.lib.optionals stdenv.isDarwin [ python2Packages.python fixDarwinDylibNames ];
-
- doCheck = !stdenv.isDarwin;
-
- checkPhase = ''
- out/Release/test-nonstrict
- out/Release/test-strict
- '';
-
- installPhase = ''
- mkdir -p $out/lib
- mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib
-
- mkdir -p $out/include
- mv http_parser.h $out/include
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP message parser written in C";
-
homepage = https://github.com/joyent/http-parser;
-
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ matthewbauer ];
+ license = licenses.mit;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 2b95742c44c..eec68015c25 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "An image loading and rendering library for X11";
+ platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index b9781ba9aa0..a4a009c6658 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "incrtcl-${version}";
version = "4.0.4";
-
+
src = fetchurl {
url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
libPrefix = "itcl3.4";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://incrtcl.sourceforge.net/;
description = "Object Oriented Enhancements for Tcl/Tk";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.tcltk;
};
}
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 36eedadc4c2..29fabdbb3b6 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "jama-${version}";
version = "1.2.5";
-
+
src = fetchurl {
url = https://math.nist.gov/tnt/jama125.zip;
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
cp *.h $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://math.nist.gov/tnt/;
description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.publicDomain;
};
}
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index de4848c7dda..eb928227432 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
platforms = platforms.unix;
+ license = licenses.jasper;
maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index daee9adb1fd..5ec10cc7e0d 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
-e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
'';
- meta = {
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.sander ];
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = [ maintainers.sander ];
+ license = licenses.afl21;
};
}
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index b9d66fdc971..e34699d7740 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-dnd-2.6.5";
builder = ./builder.sh;
-
+
src = fetchurl {
url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar;
sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
- };
+ };
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
index b182964f657..ec407076906 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-widgets-0.2.0";
builder = ./builder.sh;
-
+
src = fetchurl {
url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
- };
+ };
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = with licenses; [ afl21 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 97ffcb647d6..a478ab0fc50 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
buildInputs = [ unzip
];
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
+
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 221a2e93e4f..500c575f73a 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
inherit unzip;
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ homepage = http://httpunit.sourceforge.net;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 99d213a01da..16755471acd 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation {
sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
+ homepage = http://www.jdom.org;
+ platforms = platforms.unix;
+ license = licenses.bsdOriginal;
};
}
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index ad5192f94ce..98291a7763c 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
PREFIX=''''${out}'';
buildInputs = [ jdk ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.sander ];
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = [ maintainers.sander ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index 5ec4634d632..7f932d52dc4 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "lombok-1.16.22";
+ name = "lombok-1.18.4";
src = fetchurl {
url = "https://projectlombok.org/downloads/${name}.jar";
- sha256 = "1hr2jjlqdnxrw7ablqkf7ljc6n2q6a04ww14di06zs6i3l82zzpa";
+ sha256 = "0hlpycnmzd71ihn59hzf445dvwky2lkv57jimx91i6v7xcnr5wrr";
};
buildCommand = ''
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 6f6534cee3e..691b9905b04 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Java full-text search engine";
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 551375d33bd..ae93765ff98 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Generic unit testing framework and methodology for testing any kind of code";
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index ca9aa8fc36e..687e1e8a1de 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -71,12 +71,12 @@ in {
saxon-he = common {
pname = "saxon-he";
- version = "9.8.0.6";
+ version = "9.9.0.1";
prog = "saxon-he";
jar = "saxon9he";
src = fetchurl {
- url = mirror://sourceforge/saxon/Saxon-HE/9.8/SaxonHE9-8-0-6J.zip;
- sha256 = "03r4djm298rxz8q7jph63h9niglrl3rifxskq1b3bclx5rgxi2lk";
+ url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip;
+ sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60";
};
description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1";
};
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index d8866ae3ff8..593f4411f19 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,7 @@ stdenv.mkDerivation (rec {
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
- configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="
- # jemalloc is unable to correctly detect transparent hugepage support on
- # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
- # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
- ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp";
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
doCheck = true;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 40c06cbffdf..8cb7c1f9673 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,10 +1,6 @@
{ stdenv, fetchurl, fetchpatch }:
import ./common.nix {
inherit stdenv fetchurl;
- version = "5.0.1";
- sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9";
- patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";
- sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";
- });
+ version = "5.1.0";
+ sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
}
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
new file mode 100644
index 00000000000..175097ef785
--- /dev/null
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+ name = "jitterentropy-${version}";
+ version = "2.1.2";
+
+ src = fetchFromGitHub {
+ owner = "smuellerDD";
+ repo = "jitterentropy-library";
+ rev = "v${version}";
+ sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl";
+ };
+
+ enableParallelBuilding = true;
+
+ preInstall = ''
+ mkdir -p $out/include
+ '';
+
+ installFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ meta = {
+ description = "Provides a noise source using the CPU execution timing jitter";
+ homepage = https://github.com/smuellerDD/jitterentropy-library;
+ license = with stdenv.lib.licenses; [ gpl2 bsd3 ];
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+ };
+}
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 4e3ba399cc3..afb928aff6e 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
# Provides the mig command used by the build scripts
++ optional stdenv.isDarwin bootstrap_cmds;
buildInputs = [ openssl ]
- ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ]
+ ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic") [ keyutils ]
++ optionals (!libOnly) [ openldap libedit ];
preConfigure = "cd ./src";
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 2b50c09af5c..c459a4048e4 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
name = "leveldb-${version}";
- version = "1.18";
+ version = "1.20";
src = fetchFromGitHub {
owner = "google";
repo = "leveldb";
rev = "v${version}";
- sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d";
+ sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
};
buildPhase = ''
- make all leveldbutil libmemenv.a
+ make all
'';
installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
- for file in *.dylib*; do
+ for file in out-shared/*.dylib*; do
install_name_tool -id $out/lib/$file $file
done
'') + # XXX consider removing above after transition to cmake in the next release
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/include/leveldb/helpers
cp helpers/memenv/memenv.h $out/include/leveldb/helpers
- cp lib* $out/lib
+ cp out-shared/lib* $out/lib
+ cp out-static/lib* $out/lib
- cp leveldbutil $out/bin
+ cp out-static/leveldbutil $out/bin
";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index e3d5c7d6424..516702e2afe 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libcouchbase-${version}";
- version = "2.9.5";
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
- sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00";
+ sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
};
cmakeFlags = "-DLCB_NO_MOCK=ON";
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 752d2ce5a1e..6938cfd8c51 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
-, libidn }:
+{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
+ libidn2, libunistring, nghttp2 }:
stdenv.mkDerivation rec {
- version = "7.54.1";
+ version = "7.61.1";
name = "libgnurl-${version}";
src = fetchurl {
- url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
- sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4";
+ url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
+ sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ perl gnutls gss openssl zlib libidn ];
-
- preConfigure = ''
- sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
- '';
+ nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
+
+ buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
configureFlags = [
- "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
- "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
- "--without-polarssl" "--without-ssl" "--without-winssl"
- "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
- "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
- "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
- "--disable-file" "--disable-ftp" "--disable-smb"
+ "--disable-ntlm-wb"
+ "--without-ca-bundle"
+ "--with-ca-fallback"
];
meta = with stdenv.lib; {
@@ -33,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = https://gnunet.org/gnurl;
maintainers = with maintainers; [ falsifian vrthra ];
platforms = platforms.linux;
- license = with licenses; [ bsdOriginal mit ];
+ license = licenses.curl;
};
}
diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
new file mode 100644
index 00000000000..b1f9d0978ce
--- /dev/null
+++ b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
@@ -0,0 +1,13 @@
+Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++
+diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c
+--- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100
++++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100
+@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by
+ id3_ucs4_t *ucs4;
+
+ end = *ptr + (length & ~1);
++ if (end == *ptr)
++ return 0;
+
+ utf16 = malloc((length / 2 + 1) * sizeof(*utf16));
+ if (utf16 == 0)
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 0289a5331f8..4b7d9bdc2e3 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib gperf ];
- patches = [ ./debian-patches.patch ];
+ patches = [
+ ./debian-patches.patch
+ ./CVE-2017-11550-and-CVE-2017-11551.patch
+ ];
preConfigure = ''
configureFlagsArray+=(
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index e2d7d09b259..87c6bb03d4b 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p";
+ sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index 2da8e5ebf73..de8baa7ad19 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libmd";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj";
+ sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index c509fcd2b4f..c83d2610dbf 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ texinfo ]
- ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
+ ++ optional stdenv.isLinux alsaLib
++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs =
optional stdenv.isLinux libpulseaudio;
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 1d8dd7e20f1..e750c2c6c70 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
stdenv.mkDerivation rec {
- name = "libmtp-1.1.15";
+ name = "libmtp-1.1.16";
src = fetchurl {
url = "mirror://sourceforge/libmtp/${name}.tar.gz";
- sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h";
+ sha256 = "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index ba267b79787..d4c324d4f23 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids"
- "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids"
+ "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
+ "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
"--enable-gtk-doc"
];
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 1304aff9e3b..8c0094a3152 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,17 +1,29 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libowfat-0.31";
+ name = "libowfat-0.32";
src = fetchurl {
url = "https://www.fefe.de/libowfat/${name}.tar.xz";
- sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i";
+ sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
};
+ # Dirty patch because 0.32 "moved headers to upon install"
+ # but it breaks gatling-0.15 and opentracker-2018-05-26 ...
+ postPatch = ''
+ substituteInPlace GNUmakefile --replace \
+ 'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+ 'install -d $(DESTDIR)$(INCLUDEDIR)'
+ substituteInPlace GNUmakefile --replace \
+ 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+ 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
+ '';
+
makeFlags = "prefix=$(out)";
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://www.fefe.de/libowfat/;
+ homepage = https://www.fefe.de/libowfat/;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index 8cca5333d08..2f20150ad16 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libqmatrixclient-${version}";
- version = "0.3.0.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "libqmatrixclient";
rev = "v${version}";
- sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5";
+ sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
};
buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 1ac4a718512..154e84cfd0a 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -46,7 +46,7 @@ in {
};
libressl_2_8 = generic {
- version = "2.8.1";
- sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk";
+ version = "2.8.2";
+ sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq";
};
}
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 38e5ffcb4de..fa27a80e22e 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ m4];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++";
branch = "1.2";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl3;
};
}
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
new file mode 100644
index 00000000000..2c0ef60bc63
--- /dev/null
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ pname = "libsignon-glib";
+ version = "3639a2e90447e4640a03a44972560afe8f61aa48";
+
+ name = "${pname}-2018-10-24";
+
+ outputs = [ "out" "dev" "devdoc" "py" ];
+
+ src = fetchgit {
+ url = "https://gitlab.com/accounts-sso/${pname}";
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_412
+ docbook_xml_dtd_43
+ docbook_xsl
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ python3.pkgs.pygobject3
+ ];
+
+ mesonFlags = [
+ "-Dintrospection=true"
+ "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
+ ];
+
+ postPatch = ''
+ chmod +x build-aux/gen-error-map.py
+ patchShebangs build-aux/gen-error-map.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = ''
+ A library for managing single signon credentials which can be used from GLib applications
+ '';
+ homepage = https://gitlab.com/accounts-sso/libsignon-glib;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index ad8120d3591..51b6cbd4ed5 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- rev = "0.6.35";
+ rev = "0.7.0";
name = "libsolv-${rev}";
src = fetchFromGitHub {
inherit rev;
owner = "openSUSE";
repo = "libsolv";
- sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq";
+ sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 9eb2fe04fe6..150e299ac42 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -13,7 +13,7 @@ in
sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake ] ++
(if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa]
else if backend == "unix" then [gtk3]
@@ -22,10 +22,6 @@ in
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
'';
- cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
- "-DCMAKE_OSX_SYSROOT="
- "-DCMAKE_OSX_DEPLOYMENT_TARGET="
- ];
installPhase = ''
mkdir -p $out/{include,lib}
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e608ea300d1..68c35c49ef3 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/libuv/libuv;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
+ license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
};
}
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 6e7005195bf..6ca7b11321b 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
let
- version = "2.6.0";
+ version = "2.7.0";
in
stdenv.mkDerivation {
name = "libversion-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "repology";
repo = "libversion";
rev = version;
- sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601";
+ sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index eed0c77af80..bf685862adf 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation {
})
];
- meta = {
+ meta = with stdenv.lib; {
description = "WMF library from wvWare";
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://wvware.sourceforge.net/libwmf.html;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index 49012f8bddf..736b1a45fa2 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -2,19 +2,22 @@
stdenv.mkDerivation rec {
name = "libwpd-0.8.14";
-
+
src = fetchurl {
url = "mirror://sourceforge/libwpd/${name}.tar.gz";
sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
};
-
+
patches = [ ./gcc-0.8.patch ];
buildInputs = [ glib libgsf libxml2 ];
nativeBuildInputs = [ pkgconfig bzip2 ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for importing WordPerfect documents";
+ homepage = http://libwpd.sourceforge.net;
+ license = with licenses; [ lgpl21 mpl20 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 9d262910e14..99808be2b21 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libwpd zlib librevenge ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libwpg.sourceforge.net;
description = "C++ library to parse WPG";
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
+ license = with licenses; [ lgpl21 mpl20 ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index f2a8d75a9cb..ab0e51bae26 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
-, autoreconfHook, zlib
-, enableGrpc ? false
+{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
+, opentracing-cpp, enableGrpc ? false
}:
let
@@ -9,33 +8,31 @@ let
fetchFromGitHub {
owner = "lightstep";
repo = "lightstep-tracer-common";
- rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded";
- sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln";
+ rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
+ sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
};
in
stdenv.mkDerivation rec {
name = "lightstep-tracer-cpp-${version}";
- version = "0.36";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "lightstep";
repo = "lightstep-tracer-cpp";
- rev = "v0_36";
- sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16";
+ rev = "v${version}";
+ sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
};
postUnpack = ''
cp -r ${common}/* $sourceRoot/lightstep-tracer-common
'';
- preConfigure = lib.optionalString (!enableGrpc) ''
- configureFlagsArray+=("--disable-grpc")
- '';
+ cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
nativeBuildInputs = [
- pkgconfig automake autoreconfHook
+ pkgconfig cmake
];
buildInputs = [
@@ -48,6 +45,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
- broken = true; # 2018-02-16
};
}
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index 7b672aebe44..b2fba7df509 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A forked version of log4cpp that has been created for the Shibboleth project";
maintainers = [ maintainers.jammerful ];
+ license = licenses.lgpl21;
+ homepage = http://log4cpp.sf.net;
};
}
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index aecd75656da..cad5d0d7eca 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
description = "A lightweight C library for the Jabber protocol";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
downloadPage = "http://mcabber.com/files/loudmouth/";
downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
updateWalker = true;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 3b610271539..064f04f220c 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
homepage = http://martyr.sourceforge.net/;
+ license = stdenv.lib.licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 57321522736..f28ff1b0a21 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "matio-1.5.12";
+ name = "matio-1.5.13";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
- sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6";
+ sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 11bd437d377..e1dd7586f92 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://gitlab.com/mdds/mdds;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
index 8ff1d6d5e9a..2b61668d5c6 100644
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://gitlab.com/mdds/mdds/;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 43fee9ccead..3b0a0441cc4 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
checkInputs = [ boost ];
- meta = {
+ meta = with stdenv.lib; {
inherit version;
homepage = https://gitlab.com/mdds/mdds;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 345c6e51f0b..ca72557242f 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
and for creating libraries which extend those applications.
'';
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index d96f90b4bfd..37195d38562 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
description = "A cross platform Zero Configuration Networking library for Mono and .NET";
homepage = http://www.mono-project.com/archived/monozeroconf/;
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index cfb02ddbf9d..601e70427a1 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
"MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Mediastreamer plugin for the iLBC audio codec";
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index dd40a396244..28888e551ef 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://hunspell.sourceforge.net/;
description = "Thesaurus library from Hunspell project";
+ license = stdenv.lib.licenses.bsd3;
inherit (hunspell.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index f50b64fca3e..8f72b333aa4 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,14 +1,14 @@
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "1.1.4";
+ version = "1.1.5";
name = "nanomsg-${version}";
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nanomsg";
rev = version;
- sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl";
+ sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
};
buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index d0f992efb2b..87f9b5effac 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 7aad5be36f7..61a40753a56 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 7d0e934d911..0c597fc4b33 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -43,5 +43,8 @@ in stdenv.mkDerivation rec {
meta = {
platforms = stdenv.lib.platforms.unix;
homepage = https://www.unidata.ucar.edu/software/netcdf/;
+ license = {
+ url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html;
+ };
};
}
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index d3a4b21b4b6..cc5a115ed71 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "5.0.0"; in
+let version = "6.0.0"; in
stdenv.mkDerivation {
name = "nix-plugins-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
owner = "shlevy";
repo = "nix-plugins";
rev = version;
- sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv";
+ sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 25d4386cec2..d57461853d3 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "nlohmann_json-${version}";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h";
+ sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 904cdc6a3da..48b7acf2896 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,13 +1,20 @@
-{ fetchurl, stdenv, octave ? null }:
+{ fetchurl, stdenv, octave ? null, cmake }:
-stdenv.mkDerivation rec {
- name = "nlopt-2.4.2";
+let
+
+ version = "2.5.0";
+
+in
+
+stdenv.mkDerivation {
+ name = "nlopt-${version}";
src = fetchurl {
- url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz";
- sha256 = "12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0";
+ url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";
+ sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6";
};
+ nativeBuildInputs = [ cmake ];
buildInputs = [ octave ];
configureFlags = [
@@ -24,7 +31,7 @@ stdenv.mkDerivation rec {
];
meta = {
- homepage = http://ab-initio.mit.edu/nlopt/;
+ homepage = "https://nlopt.readthedocs.io/en/latest/";
description = "Free open-source library for nonlinear optimization";
license = stdenv.lib.licenses.lgpl21Plus;
hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index c7e133d94b2..3c5ae8537a4 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus for .NET";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 9cb7d701b9d..cdbd57d785f 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -35,9 +35,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.mozilla.org/projects/nspr/;
description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mpl20;
};
}
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 3089e6da23a..8a3de28b784 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -8,11 +8,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.38";
+ version = "3.39";
src = fetchurl {
- url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
- sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
+ url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
+ sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
};
buildInputs = [ perl zlib sqlite ]
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
preConfigure = "cd nss";
makeFlags = [
- "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr"
+ "NSPR_INCLUDE_DIR=${nspr.dev}/include"
"NSPR_LIB_DIR=${nspr.out}/lib"
"NSDISTMODE=copy"
"BUILD_OPT=1"
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 63a51a90ccd..cd3034e8612 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
name = "ntl-${version}";
- version = "11.3.0";
+ version = "11.3.1";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
+ sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs";
};
buildInputs = [
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 44c8f51e856..25e084bfb74 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Network Connectivity Tracking library for Desktop Applications";
homepage = https://launchpad.net/ntrack;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ platforms = platforms.linux;
+ license = licenses.lgpl3Plus;
};
}
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index b6728829660..aa188650860 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Open Dynamics Engine";
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://sourceforge.net/projects/opende;
+ platforms = platforms.linux;
+ license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ];
};
}
diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index f86e4d12097..1658e831ddd 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ptlib srtp libtheora speex
ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ];
- propagatedBuildInputs = [ speex ];
+ propagatedBuildInputs = [ speex ];
configureFlags = [ "--enable-h323" ];
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98";
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
-
+
meta = with stdenv.lib; {
description = "VoIP library";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ];
};
passthru = {
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index aad6911036e..3835822673c 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmake
, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
, CoreServices, AudioUnit, AudioToolbox
@@ -10,12 +10,14 @@ assert alsaSupport -> alsaLib != null;
assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
- version = "1.19.0";
+ version = "1.19.1";
name = "openal-soft-${version}";
- src = fetchurl {
- url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
- sha256 = "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi";
+ src = fetchFromGitHub {
+ owner = "kcat";
+ repo = "openal-soft";
+ rev = name;
+ sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 6af15d90cef..4a12217443c 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -25,10 +25,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.viric ];
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 2724976c5ae..e0a6c6a5705 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
cp license.txt "$out/share/doc/opencsg"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Constructive Solid Geometry library";
homepage = http://www.opencsg.org/;
- platforms = with stdenv.lib.platforms;
- linux;
- maintainers = with stdenv.lib.maintainers;
- [raskin];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.raskin ];
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index a073a29b507..f954aaf7245 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -15,4 +15,10 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ readline mysql.connector-c postgresql sqlite ];
+
+ meta = with stdenv.lib; {
+ description = "Extremely lightweight but extensible database access library written in C";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ };
}
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 0a0b4c8d549..c8208ce27ba 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "openh264-${version}";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "cisco";
repo = "openh264";
rev = "v${version}";
- sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a";
+ sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4";
};
buildInputs = [ nasm ];
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
deleted file mode 100644
index d18c971dc11..00000000000
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, fetchpatch, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
- version = "2.3.0";
- branch = "2.3";
- revision = "v${version}";
- sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
-})
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
new file mode 100644
index 00000000000..77d9e5829a1
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -0,0 +1,16 @@
+{ callPackage, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "2.3.0";
+ branch = "2.3";
+ revision = "v${version}";
+ sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
+
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-7648.patch";
+ url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
+ sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
+ })
+ ];
+})
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 7d84392d204..339f6064999 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
};
- meta = {
+ meta = with lib; {
homepage = https://www.openpam.org;
description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness";
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ matthewbauer ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ matthewbauer ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix
new file mode 100644
index 00000000000..8d083904189
--- /dev/null
+++ b/pkgs/development/libraries/openscenegraph/3.4.0.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
+, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
+, cairo, poppler, librsvg, libpng, libtiff, libXrandr
+, xineLib, boost
+, withApps ? false
+, withSDL ? false, SDL
+, withQt4 ? false, qt4
+}:
+
+stdenv.mkDerivation rec {
+ name = "openscenegraph-${version}";
+ version = "3.4.0";
+
+ src = fetchurl {
+ url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
+ sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+
+ buildInputs = [
+ freetype libjpeg jasper libxml2 zlib gdal curl libX11
+ cairo poppler librsvg libpng libtiff libXrandr boost
+ xineLib
+ ] ++ lib.optional withSDL SDL
+ ++ lib.optional withQt4 qt4;
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+
+ meta = with stdenv.lib; {
+ description = "A 3D graphics toolkit";
+ homepage = http://www.openscenegraph.org/;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.linux;
+ license = "OpenSceneGraph Public License - free LGPL-based license";
+ };
+}
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index cddc2038791..9f5ef3ff68c 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
name = "openscenegraph-${version}";
- version = "3.6.2";
+ version = "3.6.3";
src = fetchFromGitHub {
owner = "openscenegraph";
repo = "OpenSceneGraph";
- rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36";
- sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id";
+ rev = "d011ca4e8d83549a3688bf6bb8cd468dd9684822";
+ sha256 = "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q";
};
nativeBuildInputs = [ pkgconfig cmake doxygen ];
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 86015abb981..973f8304273 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
description = "A cryptographic library that implements the SSL and TLS protocols";
platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.cstrahan ];
+ license = licenses.openssl;
priority = 10; # resolves collision with ‘man-pages’
};
}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 87751188a03..2ad4b8d904b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -51,6 +51,8 @@ let
configureScript = {
"x86_64-darwin" = "./Configure darwin64-x86_64-cc";
"x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
+ "armv6l-linux" = "./Configure linux-armv4 -march=armv6";
+ "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
new file mode 100644
index 00000000000..3b0354b9fe8
--- /dev/null
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+ name = "opentracing-cpp-${version}";
+ version = "1.5.0";
+ src = fetchFromGitHub {
+ owner = "opentracing";
+ repo = "opentracing-cpp";
+ rev = "v${version}";
+ sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
+ };
+ buildInputs = [ cmake ];
+
+ meta = {
+ description = "C++ implementation of the OpenTracing API";
+ homepage = http://opentracing.io;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ rob ];
+ };
+
+}
+
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index aae6ed0f688..b69ded64839 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
pango
];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango.";
+ homepage = https://sourceforge.net/projects/pangopdf;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 9fb2e0b7fed..14eff45e4a1 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
- "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
];
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index b29388790d0..67f343d6038 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
maintainers = with maintainers; [ ttuegel ];
+ license = licenses.lgpl21;
};
src = fetchurl {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 0487886a896..773478f4dc0 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = https://phonon.kde.org/;
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
+ license = with licenses; [ bsd3 lgpl2Plus ];
};
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index c86b0ed3d1c..664d1fa601e 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yoda-${version}";
- version = "1.7.1";
+ version = "1.7.3";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
- sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd";
+ sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb";
};
pythonPath = []; # python wrapper support
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
- license = stdenv.lib.licenses.gpl2;
+ license = stdenv.lib.licenses.gpl3;
homepage = https://yoda.hepforge.org;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index acf53139022..1704703f801 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -37,10 +37,10 @@ stdenv.mkDerivation rec {
done
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://podofo.sourceforge.net;
description = "A library to work with the PDF file format";
- platforms = stdenv.lib.platforms.all;
- maintainers = [ ];
+ platforms = platforms.all;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index 54e10b96592..b13335561ac 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -25,9 +25,10 @@ stdenv.mkDerivation {
done
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A Qt wrapper around PolKit";
- maintainers = with stdenv.lib.maintainers; [ ttuegel ];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.ttuegel ];
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index edec0b7f069..592a1f1470a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
- meta = {
+ meta = with stdenv.lib; {
description = "Command line option parsing library";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 04fdeea1fa0..37cf29c8658 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -16,7 +16,7 @@
### NixOS - usage:
==================
- services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
+ services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ];
### important Postgis implementation details:
diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index 29ff988a226..d40b4442e38 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 library for QR-codes";
- maintainers = [ ];
+ license = stdenv.lib.licenses.mit;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index ae60a6f69d6..d425de243f5 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
description = "Portable Tools from OPAL VoIP";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ license = with licenses; [ beerware bsdOriginal mpl10 ];
};
passthru = {
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 018a57ad057..b5a01698e5e 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
name = "libupnp-${version}";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "mrjimenez";
repo = "pupnp";
rev = "release-${version}";
- sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl";
+ sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx";
};
+ outputs = [ "dev" "out" ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 29202396c05..a7077c69dd8 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake qt4 ];
- meta = {
- maintainers = [ ];
+ meta = with stdenv.lib; {
+ description = "Lightweight data-interchange format";
+ homepage = http://qjson.sourceforge.net/;
+ license = licenses.lgpl21;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index d09c0d9a6ce..0d9ae21e87e 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
NIX_LDFLAGS = [ "-lqca-qt5" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt library for OAuth authentication";
inherit (qt5.qtbase.meta) platforms;
- maintainers = [ ];
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index c8b01c46080..85e45d3fad0 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation {
buildInputs = [ gfortran openblas ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for fast updating of qr and cholesky decompositions";
+ homepage = https://sourceforge.net/projects/qrupdate/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 0691f26b471..95b82f8f3cf 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation {
passthru = {inherit mysqlSupport;};
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ license = with licenses; [ gpl2 qpl ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index 5cf49450422..ae99035d226 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -42,11 +42,12 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 libX11 bluez perl ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt Mobility";
homepage = http://qt.nokia.com/products/qt-addons/mobility;
- maintainers = with stdenv.lib.maintainers; [qknight];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.qknight ];
+ platforms = platforms.linux;
+ license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ];
};
}
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 040072cb463..88591e880de 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
description = "QtScript bindings generator";
homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/;
inherit (qt4.meta) platforms;
- maintainers = [ ];
+ license = stdenv.lib.licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index 9e7c5c1d4e3..84062408d45 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ncurses];
patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
- meta = {
+
+ meta = with stdenv.lib; {
branch = "5";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
new file mode 100644
index 00000000000..4668839ebb9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "QuadProgpp-${version}";
+ version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
+
+ src = fetchFromGitHub {
+ owner = "liuq";
+ repo = "QuadProgpp";
+ rev = version;
+ sha256 = "02r0dlk2yjpafknvm945vbgs4sl26w2i1gw3pllar9hi364y8hnx";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/liuq/QuadProgpp;
+ license = licenses.mit;
+ description = ''
+ A C++ library for Quadratic Programming which implements the
+ Goldfarb-Idnani active-set dual method.
+ '';
+ maintainers = with maintainers; [ fuuzetsu ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index c89e9e4296c..b41469c215e 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,13 +1,11 @@
-{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
inherit (args) cudatoolkit;
};
-in
-
-{
+in rec {
cudnn_cudatoolkit_7 = generic rec {
# Old URL is v4 instead of v4.0 for some reason...
version = "4";
@@ -38,16 +36,34 @@ in
};
cudnn_cudatoolkit_9_0 = generic rec {
- version = "7.0.5";
+ version = "7.3.0";
cudatoolkit = cudatoolkit_9_0;
- srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
- sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs";
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz";
+ sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0";
};
- cudnn_cudatoolkit_9 = generic rec {
- version = "7.0.5";
- cudatoolkit = cudatoolkit_9;
- srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
- sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
+ cudnn_cudatoolkit_9_1 = generic rec {
+ version = "7.1.3";
+ cudatoolkit = cudatoolkit_9_1;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz";
+ sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx";
};
+
+ cudnn_cudatoolkit_9_2 = generic rec {
+ version = "7.2.1";
+ cudatoolkit = cudatoolkit_9_2;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz";
+ sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y";
+ };
+
+ cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2;
+
+ cudnn_cudatoolkit_10_0 = generic rec {
+ version = "7.3.1";
+ cudatoolkit = cudatoolkit_10_0;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.1.20.tgz";
+ sha256 = "1yp35mng4ym40g5rqp63dcpa6jg4q1pnjkspnhlakzzdy8is65af";
+ };
+
+ cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0;
}
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
new file mode 100644
index 00000000000..3cf5c3619a9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, gmp}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "lrs";
+ version = "7.0";
+
+ src = fetchurl {
+ url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz";
+ sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9";
+ };
+
+ buildInputs = [ gmp ];
+
+ preBuild = ''
+ export makeFlags="$makeFlags prefix=$out";
+ '';
+
+ meta = {
+ inherit version;
+ description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
+ license = stdenv.lib.licenses.gpl2 ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
+ };
+}
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
new file mode 100644
index 00000000000..5294c779a32
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, cmake, google-gflags, which
+, lsb-release, glog, protobuf, cbc, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "or-tools-${version}";
+ version = "v6.9.1";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "or-tools";
+ rev = version;
+ sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+ };
+
+ # The original build system uses cmake which does things like pull
+ # in dependencies through git and Makefile creation time. We
+ # obviously don't want to do this so instead we provide the
+ # dependencies straight from nixpkgs and use the make build method.
+ configurePhase = ''
+ cat < Makefile.local
+ UNIX_GFLAGS_DIR=${google-gflags}
+ UNIX_GLOG_DIR=${glog}
+ UNIX_PROTOBUF_DIR=${protobuf}
+ UNIX_CBC_DIR=${cbc}
+ EOF
+ '';
+
+ buildPhase = ''
+ make cc
+ '';
+
+ installPhase = ''
+ make install_cc prefix=$out
+ '';
+
+ patches = [
+ # In "expected" way of compilation, the glog package is compiled
+ # with gflags support which then makes gflags header transitively
+ # included through glog. However in nixpkgs we don't compile glog
+ # with gflags so we have to include it ourselves. Upstream should
+ # always include gflags to support both ways I think.
+ #
+ # Upstream ticket: https://github.com/google/or-tools/issues/902
+ ./gflags-include.patch
+ ];
+
+ nativeBuildInputs = [
+ cmake lsb-release which zlib
+ ];
+ propagatedBuildInputs = [
+ google-gflags glog protobuf cbc
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/google/or-tools;
+ license = licenses.asl20;
+ description = ''
+ Google's software suite for combinatorial optimization.
+ '';
+ maintainers = with maintainers; [ fuuzetsu ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
new file mode 100644
index 00000000000..08f76180638
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
@@ -0,0 +1,12 @@
+diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc
+index cb0a360b..c2f055eb 100644
+--- a/ortools/data/jobshop_scheduling_parser.cc
++++ b/ortools/data/jobshop_scheduling_parser.cc
+@@ -14,6 +14,7 @@
+ #include "ortools/data/jobshop_scheduling_parser.h"
+
+ #include
++#include
+
+ #include "google/protobuf/wrappers.pb.h"
+ #include "ortools/base/filelineiter.h"
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 83e177c66c1..3961374a9b1 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,11 +1,7 @@
-{ stdenv
-, fetchurl
-, gfortran
-, cmake
-, blas
-, liblapack
-, mpi
-}:
+{ stdenv, fetchurl, cmake, openssh
+, gfortran, mpi, openblasCompat
+} :
+
stdenv.mkDerivation rec {
name = "scalapack-${version}";
@@ -16,12 +12,38 @@ stdenv.mkDerivation rec {
sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
};
- buildInputs = [ cmake mpi liblapack blas gfortran ];
+ nativeBuildInputs = [ cmake openssh ];
+ buildInputs = [ mpi gfortran openblasCompat ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ preConfigure = ''
+ cmakeFlagsArray+=(
+ -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+ -DLAPACK_LIBRARIES="-lopenblas"
+ -DBLAS_LIBRARIES="-lopenblas"
+ )
+ '';
+
+ checkPhase = ''
+ # make sure the test starts even if we have less than 4 cores
+ export OMPI_MCA_rmaps_base_oversubscribe=1
+
+ # Run single threaded
+ export OMP_NUM_THREADS=1
+
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
+ export CTEST_OUTPUT_ON_FAILURE=1
+
+ make test
+ '';
meta = with stdenv.lib; {
homepage = http://www.netlib.org/scalapack/;
description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
- license = licenses.bsdOriginal;
+ license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.costrouc ];
};
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 03a801a3240..37ef0ce7527 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL
}:
let
- version = "2.5.0";
+ version = "2.5.1";
in
stdenv.mkDerivation rec {
name = "sfml-${version}";
- src = fetchurl {
+
+ src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
- sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
+ sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
};
- buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
libXrandr libXrender xcbutilimage
] ++ stdenv.lib.optional stdenv.isLinux udev
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes" ];
+
meta = with stdenv.lib; {
homepage = http://www.sfml-dev.org/;
description = "Simple and fast multimedia library";
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index dc3f4a118f6..f795dfef9e4 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
checkInputs = [ python ];
doCheck = false; # fails, probably missing something
- meta = {
+ meta = with stdenv.lib; {
description = "An advanced font engine";
- maintainers = [ stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 28b96d17aa6..196fb59bb17 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "simgear-${version}";
- version = "2017.3.1";
- shortVersion = "2017.3";
+ version = "2018.2.2";
+ shortVersion = "2018.2";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
- sha256 = "1x71wvycs2bjgmmacswgk6091p65p46fr40mr7f4kcipnx88bq0f";
+ sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
};
buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
@@ -28,4 +28,3 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2;
};
}
-
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 9fe88b771be..ca2ff666b7a 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ glib openssl ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
+ homepage = http://sofia-sip.sourceforge.net/;
+ platforms = platforms.linux;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index c903b041fd4..f3cfc1e56e8 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sundials";
- version = "3.2.0";
+ version = "3.2.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj";
+ sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index b74c58a2e38..6577ebeae28 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
name = "szip-${version}";
version = "2.1.1";
src = fetchurl {
- url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz";
- sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9";
+ url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
+ sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1";
};
meta = {
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 8a76e886b4f..b8e7518cd33 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation {
postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "A type 1 font rasterizer library for UNIX/X11";
+ homepage = http://www.t1lib.org/;
+ license = with licenses; [ gpl2 lgpl2 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 0059243890d..b667e604740 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Additional taglib plugins";
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 6da524c2339..86006806baa 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mono";
repo = "taglib-sharp";
-
rev = "taglib-sharp-${version}";
sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp";
};
@@ -21,6 +20,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for reading and writing metadata in media files";
+ homepage = https://github.com/mono/taglib-sharp;
platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 1caa8a376fb..99892a41fa4 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://developer.kde.org/~wheeler/taglib.html;
repositories.git = git://github.com/taglib/taglib.git;
-
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
- maintainers = [ ];
+ license = with stdenv.lib.licenses; [ lgpl21 mpl11 ];
};
}
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 67db6e5097d..a2cb103a182 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
})
+
+ (fetchpatch {
+ # https://github.com/taglib/taglib/pull/869
+ name = "CVE-2018-11439.patch";
+ url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
+ sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
+ })
];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 77c3c6458ad..7c758d29835 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
-, docbook_xsl, docbook_xml_dtd_42
+, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig fixDarwinDylibNames ];
buildInputs = [
python readline libxslt docbook_xsl docbook_xml_dtd_42
];
- preConfigure = ''
- sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
+ prePatch = ''
+ patchShebangs buildtools/bin/waf
'';
configureFlags = [
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index a92c7b74ebf..293baa492c5 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://tclap.sourceforge.net/;
description = "Templatized C++ Command Line Parser Library";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index fae51aea477..1247d9ffa84 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
+ homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/;
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 9ca2481c3b0..ca6a4997abf 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
passthru.python = python2;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://telepathy.freedesktop.org;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
};
}
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index ba95da77b72..51dabbd2beb 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://tidyp.com/;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index c716ae7f8db..03f8e20b38d 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
stdenv.mkDerivation rec {
name = "uriparser-${version}";
- version = "0.8.6";
+ version = "0.9.0";
# Release tarball differs from source tarball
src = fetchurl {
url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
- sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287";
+ sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc";
};
- nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ];
+ nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ];
doCheck = true;
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
new file mode 100644
index 00000000000..8d2276def70
--- /dev/null
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -0,0 +1,187 @@
+# NOTE: this expression is NOT exported from the top-level of all-packages.nix,
+# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a
+# very exact version.
+
+{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
+, doCheck ? false
+, snapshot ? true
+}:
+
+let
+ arch = if stdenv.isAarch32
+ then if stdenv.is64bit
+ then"arm64"
+ else "arm"
+ else if stdenv.is64bit
+ then"x64"
+ else "ia32";
+ git_url = "https://chromium.googlesource.com";
+
+ # This data is from the DEPS file in the root of a V8 checkout
+ deps = {
+ "base/trace_event/common" = fetchgit {
+ url = "${git_url}/chromium/src/base/trace_event/common.git";
+ rev = "0e9a47d74970bee1bbfc063c47215406f8918699";
+ sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
+ };
+ "build" = fetchgit {
+ url = "${git_url}/chromium/src/build.git";
+ rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
+ sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
+ };
+ "buildtools" = fetchgit {
+ url = "${git_url}/chromium/buildtools.git";
+ rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
+ sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
+ };
+ "test/benchmarks/data" = fetchgit {
+ url = "${git_url}/v8/deps/third_party/benchmarks.git";
+ rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
+ sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
+ };
+ "test/mozilla/data" = fetchgit {
+ url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
+ rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
+ sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
+ };
+ "test/test262/data" = fetchgit {
+ url = "${git_url}/external/github.com/tc39/test262.git";
+ rev = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811";
+ sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg";
+ };
+ "test/test262/harness" = fetchgit {
+ url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
+ rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
+ sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
+ };
+ "test/wasm-js" = fetchgit {
+ url = "${git_url}/external/github.com/WebAssembly/spec.git";
+ rev = "a7e226a92e660a3d5413cfea4269824f513259d2";
+ sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp";
+ };
+ "testing/gtest" = fetchgit {
+ url = "${git_url}/external/github.com/google/googletest.git";
+ rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
+ sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
+ };
+ "third_party/icu" = fetchgit {
+ url = "${git_url}/chromium/deps/icu.git";
+ rev = "741688ebf328da9adc52505248bf4e2ef868722c";
+ sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9";
+ };
+ "third_party/instrumented_libraries" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
+ rev = "28417458ac4dc79f68915079d0f283f682504cc0";
+ sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3";
+ };
+ "third_party/jinja2" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/jinja2.git";
+ rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
+ sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
+ };
+ "third_party/markupsafe" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/markupsafe.git";
+ rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
+ sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
+ };
+ "tools/clang" = fetchgit {
+ url = "${git_url}/chromium/src/tools/clang.git";
+ rev = "8688d267571de76a56746324dcc249bf4232b85a";
+ sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s";
+ };
+ "tools/gyp" = fetchgit {
+ url = "${git_url}/external/gyp.git";
+ rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
+ sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
+ };
+ "tools/luci-go" = fetchgit {
+ url = "${git_url}/chromium/src/tools/luci-go.git";
+ rev = "45a8a51fda92e123619a69e7644d9c64a320b0c1";
+ sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj";
+ };
+ "tools/swarming_client" = fetchgit {
+ url = "${git_url}/infra/luci/client-py.git";
+ rev = "4bd9152f8a975d57c972c071dfb4ddf668e02200";
+ sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh";
+ };
+ };
+
+in
+
+stdenv.mkDerivation rec {
+ name = "v8-${version}";
+ version = "6.4.388.40";
+
+ inherit doCheck;
+
+ src = fetchFromGitHub {
+ owner = "v8";
+ repo = "v8";
+ rev = version;
+ sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a";
+ };
+
+ postUnpack = ''
+ ${lib.concatStringsSep "\n" (
+ lib.mapAttrsToList (n: v: ''
+ mkdir -p $sourceRoot/${n}
+ cp -r ${v}/* $sourceRoot/${n}
+ '') deps)}
+ '';
+
+ prePatch = ''
+ # use our gn, not the bundled one
+ sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
+
+ # disable tests
+ if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
+
+ # disable sysroot usage
+ chmod u+w build/config build/config/sysroot.gni
+ sed -i build/config/sysroot.gni \
+ -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }'
+
+ # patch shebangs (/usr/bin/env)
+ patchShebangs tools/dev/v8gen.py
+ '';
+
+ configurePhase = ''
+ tools/dev/v8gen.py -vv ${arch}.release -- \
+ is_component_build=true \
+ ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
+ is_clang=false \
+ linux_use_bundled_binutils=false \
+ treat_warnings_as_errors=false \
+ use_custom_libcxx=false \
+ use_custom_libcxx_for_host=false
+ '';
+
+ nativeBuildInputs = [ gn ninja pkgconfig ];
+ buildInputs = [ python glib ];
+
+ buildPhase = ''
+ ninja -C out.gn/${arch}.release/
+ '';
+
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
+ install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
+ mkdir -p "$out/lib"
+ for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
+ install -vD out.gn/${arch}.release/$f "$out/lib/$f"
+ done
+ install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
+ mkdir -p "$out/include"
+ cp -vr include/*.h "$out/include"
+ cp -vr include/libplatform "$out/include"
+ '';
+
+ meta = with lib; {
+ description = "Google's open source JavaScript engine";
+ maintainers = with maintainers; [ cstrahan proglodyte ];
+ platforms = platforms.linux;
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index b85d76640cf..afd29aeb006 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
- "-DCMAKE_OSX_SYSROOT="
- "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix
index 7eae5819daf..71b3dc24fe2 100644
--- a/pkgs/development/libraries/webkitgtk/2.22.nix
+++ b/pkgs/development/libraries/webkitgtk/2.22.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.22.2";
+ version = "2.22.3";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l";
+ sha256 = "0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx";
};
patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a4c2b329714..4aff6063183 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,39 +1,83 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
+, libpng, ffmpeg_4
+, python3Packages # TODO: Temporary
}:
-let pname = "wlroots";
- version = "unstable-2018-03-16";
+let
+ pname = "wlroots";
+ version = "0.1";
+ meson480 = meson.overrideAttrs (oldAttrs: rec {
+ name = pname + "-" + version;
+ pname = "meson";
+ version = "0.48.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
+ };
+ patches = builtins.filter # Remove gir-fallback-path.patch
+ (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str))
+ oldAttrs.patches;
+ });
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
- rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
- sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
+ rev = version;
+ sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c";
};
- # $out for the library and $bin for rootston
- outputs = [ "out" "bin" ];
+ patches = [ (fetchpatch { # TODO: Only required for version 0.1
+ url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch;
+ sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5";
+ }) ];
- nativeBuildInputs = [ meson ninja pkgconfig ];
+ # $out for the library, $bin for rootston, and $examples for the example
+ # programs (in examples) AND rootston
+ outputs = [ "out" "bin" "examples" ];
+
+ nativeBuildInputs = [ meson480 ninja pkgconfig ];
buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
+ libpng ffmpeg_4
+ ];
+
+ mesonFlags = [
+ "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+ "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled"
];
- # Install rootston (the reference compositor) to $bin
postInstall = ''
- mkdir -p $bin/bin
- cp rootston/rootston $bin/bin/
- mkdir $bin/lib
- cp libwlroots* $bin/lib/
- patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
- mkdir $bin/etc
- cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
+ # Install rootston (the reference compositor) to $bin and $examples
+ for output in "$bin" "$examples"; do
+ mkdir -p $output/bin
+ cp rootston/rootston $output/bin/
+ mkdir $output/lib
+ cp libwlroots* $output/lib/
+ patchelf \
+ --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+ $output/bin/rootston
+ mkdir $output/etc
+ cp ../rootston/rootston.ini.example $output/etc/rootston.ini
+ done
+ # Install ALL example programs to $examples:
+ # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
+ # screenshot output-layout multi-pointer rotation tablet touch pointer
+ # simple
+ mkdir -p $examples/bin
+ cd ./examples
+ for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
+ patchelf \
+ --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+ "$binary"
+ cp "$binary" "$examples/bin/wlroots-$binary"
+ done
'';
meta = with stdenv.lib; {
@@ -42,8 +86,5 @@ in stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
- # Marked as broken until the first official/stable release (upstream
- # request). See #38344 for the public discussion.
- broken = true;
};
}
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 9c307b2d15a..040273e28b9 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,60 +1,26 @@
-{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
-, derez, rez, setfile
+, cf-private, derez, rez, setfile
, AGL, Cocoa, Kernel
}:
-with stdenv.lib;
-
stdenv.mkDerivation rec {
- version = "3.0.2";
+ version = "3.0.4";
name = "wxmac-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
- sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
+ src = fetchzip {
+ url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
+ sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
};
- patches =
- [ # Use std::abs() from instead of abs() from to avoid problems
- # with abiguous overloads for clang-3.8 and gcc6.
- (fetchpatch {
- name = "patch-stc-abs.diff";
- url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch;
- sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq";
- })
-
- # Various fixes related to Yosemite. Revisit in next stable release.
- # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
- # Theoretically the above linked patch should still be needed, but it isn't.
- # Try to find out why.
- (fetchpatch {
- name = "patch-yosemite.diff";
- url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff;
- sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb";
- })
-
- # Remove uncenessary includes
- # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
- (fetchpatch {
- name = "patch-quicktime-removal.diff";
- url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff;
- sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y";
- })
-
- # Patch for wxOSXPrintData, custom paper not applied
- # http://trac.wxwidgets.org/ticket/16959
- (fetchpatch {
- name = "wxPaperCustomPatch.patch";
- url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch;
- sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl";
- })
- ];
-
buildInputs = [
expat libiconv libjpeg libpng libtiff zlib
derez rez setfile
Cocoa Kernel
+
+ # Needed for CFURLGetFSRef, etc. which have deen deprecated
+ # since 10.9 and are not part of swift-corelibs CoreFoundation.
+ cf-private
];
propagatedBuildInputs = [ AGL ];
@@ -98,7 +64,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
platforms = platforms.darwin;
license = licenses.wxWindows;
maintainers = [ maintainers.lnl7 ];
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index f93f7ed8746..2d7289ca664 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,13 +11,6 @@ let
inherit sha256;
};
- patches = stdenv.lib.optional (version == "1.4.7") [
- # fix notmuch build, see https://notmuchmail.org/faq/#index12h2
- # cannot fetchpatch this because base directory differs
- # TODO: remove on next xapian update
- ./fix-notmuch-tagging.patch
- ];
-
outputs = [ "out" "man" "doc" ];
buildInputs = [ libuuid zlib ];
@@ -43,5 +36,5 @@ let
in {
# xapian-ruby needs 1.2.22 as of 2017-05-06
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
- xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
+ xapian_1_4 = generic "1.4.9" "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd";
}
diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
deleted file mode 100644
index 6deae76d2aa..00000000000
--- a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
-From: Olly Betts
-Date: Thu, 26 Jul 2018 17:26:52 +1200
-Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
- databases"
-
-The amended check isn't conservative enough as there may be postlist
-changes in the inverter while the table is unmodified. This breaks
-testcase T150-tagging.sh in notmuch's testsuite, reported by David
-Bremner.
-
-This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
----
- xapian-core/backends/glass/glass_postlist.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
-index 80e578b85..a47f14a68 100644
---- a/backends/glass/glass_postlist.cc
-+++ b/backends/glass/glass_postlist.cc
-@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
- (void)need_pos;
- if (term_.empty())
- RETURN(NULL);
-- if (!this_db.get() || this_db->postlist_table.is_modified())
-+ if (!this_db.get() || this_db->postlist_table.is_writable())
- RETURN(NULL);
- RETURN(new GlassPostList(this_db, term_, cursor->clone()));
- }
---
-2.11.0
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 79f75abfd91..3dd2cb5b874 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
})
];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://linux.techass.com/projects/xdb/;
description = "C++ class library formerly known as XDB";
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ platforms = platforms.linux;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 69b5b95e761..d86dac05073 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.xine-project.org/;
description = "A high-performance, portable and reusable multimedia playback engine";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9d006527717..12fb076d946 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec{
name = "zimg-${version}";
- version = "2.7.5";
+ version = "2.8";
src = fetchFromGitHub {
owner = "sekrit-twc";
repo = "zimg";
rev = "release-${version}";
- sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
+ sha256 = "0s4n1swg1hgv81l8hvf0ny0fn305vf6l6dakbj452304p6ihxd83";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix
deleted file mode 100644
index 83ba93e63b7..00000000000
--- a/pkgs/development/misc/avr/binutils/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
- version = "2.31.1";
-in
-stdenv.mkDerivation {
- name = "avr-binutils-${version}";
-
- src = fetchurl {
- url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
- sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
- };
- configureFlags = [ "--target=avr" "--enable-languages=c,c++" ];
-
- meta = with stdenv.lib; {
- description = "the GNU Binutils for AVR microcontrollers";
- homepage = http://www.gnu.org/software/binutils/;
- license = licenses.gpl3Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ mguentner ];
- };
-}
diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
deleted file mode 100644
index f0ec21b7589..00000000000
--- a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c
-index 838ebc2..3ac4ee7 100644
---- a/gcc/gcc-ar.c
-+++ b/gcc/gcc-ar.c
-@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path)
- dir_separator, NULL);
- prefix_from_string (self_libexec_prefix, &target_path);
-
-- /* Add path as a last resort. */
-- prefix_from_env ("PATH", &path);
-+ /* Add path to avrbinutils. */
-+ prefix_from_string ("@avrbinutils@/bin", &path);
- }
-
- int
diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
deleted file mode 100644
index 5c9b56c9918..00000000000
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
-
-let
- version = "8.2.0";
-in
-stdenv.mkDerivation {
-
- name = "avr-gcc-${version}";
- src = fetchurl {
- url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
- };
-
- patches = [
- ./avrbinutils-path.patch
- ];
-
- # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute
- # it now.
- postPatch = ''
- substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils}
- '';
-
- buildInputs = [ gmp mpfr libmpc zlib avrbinutils ];
-
- nativeBuildInputs = [ texinfo ];
-
- hardeningDisable = [ "format" ];
-
- stripDebugList= [ "bin" "libexec" ];
-
- enableParallelBuilding = true;
-
- configurePhase = ''
- mkdir gcc-build
- cd gcc-build
- ../configure \
- --prefix=$out \
- --host=$CHOST \
- --build=$CHOST \
- --target=avr \
- --with-as=${avrbinutils}/bin/avr-as \
- --with-gnu-as \
- --with-gnu-ld \
- --with-ld=${avrbinutils}/bin/avr-ld \
- --with-system-zlib \
- --disable-install-libiberty \
- --disable-nls \
- --disable-libssp \
- --with-dwarf2 \
- --enable-languages=c,c++'';
-
- meta = with stdenv.lib; {
- description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
- homepage = http://gcc.gnu.org;
- license = licenses.gpl3Plus;
- platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ mguentner ];
- };
-}
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 039846d5fcf..ab9a696afb0 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }:
+{ stdenv, fetchurl, automake, autoconf }:
let
version = "2.0.0";
@@ -11,28 +11,21 @@ stdenv.mkDerivation {
sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
};
- buildInputs = [ avrgcc avrbinutils automake autoconf ];
- configurePhase = ''
- unset LD
- unset AS
- unset AR
- unset CC
- unset CXX
- unset RANLIB
- unset STRIP
-
- ./configure --prefix=$out --build=$(./config.guess) --host=avr
- '';
+ nativeBuildInputs = [ automake autoconf ];
# Make sure we don't strip the libraries in lib/gcc/avr.
- stripDebugList= "bin";
+ stripDebugList = "bin";
dontPatchELF = true;
+ passthru = {
+ incdir = "/avr/include";
+ };
+
meta = with stdenv.lib; {
description = "a C runtime library for AVR microcontrollers";
homepage = http://savannah.nongnu.org/projects/avr-libc/;
license = licenses.bsd3;
- platforms = platforms.unix;
+ platforms = [ "avr-none" ];
maintainers = with maintainers; [ mguentner ];
};
}
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index b43deeceb86..4cb612523dc 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -15,12 +15,12 @@ buildRustPackage rec {
cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/cgag/loc;
description = "Count lines of code quickly";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
new file mode 100644
index 00000000000..693cfa093b0
--- /dev/null
+++ b/pkgs/development/misc/newlib/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, buildPackages }:
+
+let version = "3.0.0";
+in stdenv.mkDerivation {
+ name = "newlib-${version}";
+ src = fetchurl {
+ url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
+ sha256 = "0chka3szh50krcz2dcxcsr1v1i000jylwnsrp2pgrrblxqsn6mn8";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ # newlib expects CC to build for build platform, not host platform
+ preConfigure = ''
+ export CC=cc
+ '';
+
+ configurePlatforms = [ "build" "target" ];
+ configureFlags = [
+ "--host=${stdenv.buildPlatform.config}"
+
+ "--disable-newlib-supplied-syscalls"
+ "--disable-nls"
+ "--enable-newlib-io-long-long"
+ "--enable-newlib-register-fini"
+ "--enable-newlib-retargetable-locking"
+ ];
+
+ dontDisableStatic = true;
+
+ passthru = {
+ incdir = "/${stdenv.targetPlatform.config}/include";
+ libdir = "/${stdenv.targetPlatform.config}/lib";
+ };
+}
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
new file mode 100644
index 00000000000..0a7b4fd9d9a
--- /dev/null
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, avrgcc, avrbinutils
+, gcc-arm-embedded, binutils-arm-embedded
+, teensy-loader-cli, dfu-programmer, dfu-util }:
+
+let version = "0.6.144";
+
+in stdenv.mkDerivation {
+ name = "qmk_firmware-${version}";
+ src = fetchFromGitHub {
+ owner = "qmk";
+ repo = "qmk_firmware";
+ rev = version;
+ sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
+ fetchSubmodules = true;
+ };
+ buildFlags = "all:default";
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+ nativeBuildInputs = [
+ avrgcc
+ avrbinutils
+ gcc-arm-embedded
+ teensy-loader-cli
+ dfu-programmer
+ dfu-util
+ ];
+}
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index 0c601c7773c..fbe48803f2d 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, gcc-arm-embedded, python2
+, gcc-arm-embedded, binutils-arm-embedded, python2
, skipTargets ? [
# These targets do not build, for the reasons listed, along with the last version checked.
# Probably all of the issues with these targets need to be addressed upstream.
@@ -24,14 +24,17 @@ in stdenv.mkDerivation rec {
sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
};
- buildInputs = [
- gcc-arm-embedded
+ nativeBuildInputs = [
+ gcc-arm-embedded binutils-arm-embedded
python2
];
postPatch = ''
sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+ substitutateInPlace Makefile \
+ --replace "--specs=nano.specs" ""
'';
enableParallelBuilding = true;
@@ -58,7 +61,6 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/betaflight/betaflight;
license = licenses.gpl3;
maintainers = with maintainers; [ elitak ];
- platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index cb9cc80d325..102b1eb8048 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, gcc-arm-embedded, ruby
+, gcc-arm-embedded, binutils-arm-embedded, ruby
}:
let
@@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
};
- buildInputs = [
- gcc-arm-embedded
+ nativeBuildInputs = [
+ gcc-arm-embedded binutils-arm-embedded
ruby
];
@@ -26,6 +26,9 @@ in stdenv.mkDerivation rec {
sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+ substitutateInPlace Makefile \
+ --replace "--specs=nano.specs" ""
'';
enableParallelBuilding = true;
@@ -50,7 +53,6 @@ in stdenv.mkDerivation rec {
homepage = https://inavflight.github.io;
license = licenses.gpl3;
maintainers = with maintainers; [ elitak ];
- platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 1bc1d110db1..68792038d00 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
-
+
Terms and Conditions
This is the Android Software Development Kit License Agreement
@@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement
3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
@@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
3
-
+
34908058
1f92abf3a76be66ae8032257fc7620acbd2b2e3a
google_apis-3-r03.zip
@@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
42435735
9b6e86d8568558de4d606a7debc4f6049608dbd0
google_apis-4_r02.zip
@@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
49123776
46eaeb56b645ee7ffa24ede8fa17f3df70db0503
google_apis-5_r01.zip
@@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
53382941
5ff545d96e031e09580a6cf55713015c7d4936b2
google_apis-6_r01.zip
@@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
53691339
2e7f91e0fe34fef7f58aeced973c6ae52361b5ac
google_apis-7_r01.zip
@@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
59505020
3079958e7ec87222cac1e6b27bc471b27bf2c352
google_apis-8_r02.zip
@@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
63401546
78664645a1e9accea4430814f8694291a7f1ea5d
google_apis-9_r02.zip
@@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
65781578
cc0711857c881fa7534f90cf8cc09b8fe985484d
google_apis-10_r02.zip
@@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
83477179
5eab5e81addee9f3576d456d205208314b5146a5
google_apis-11_r01.zip
@@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
86099835
e9999f4fa978812174dfeceec0721c793a636e5d
google_apis-12_r01.zip
@@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
88615525
3b153edd211c27dc736c893c658418a4f9041417
google_apis-13_r01.zip
@@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
106533714
f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39
google_apis-14_r02.zip
@@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
3
-
+
106624396
d0d2bf26805eb271693570a1aaec33e7dc3f45e9
google_apis-15_r03.zip
@@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
127341982
ee6acf1b01020bfa8a8e24725dbc4478bee5e792
google_apis-16_r04.zip
@@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
137231243
a076be0677f38df8ca5536b44dfb411a0c808c4f
google_apis-17_r04.zip
@@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
143195183
6109603409debdd40854d4d4a92eaf8481462c8b
google_apis-18_r04.zip
@@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
20
-
+
147081
5b933abe830b2f25b4c0f171d45e9e0651e56311
google_apis-19_r20.zip
@@ -1090,7 +1090,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
154865
31361c2868f27343ee917fbd259c1463821b6145
google_apis-24_r1.zip
@@ -1123,7 +1123,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
154871
550e83eea9513ab11c44919ac6da54b36084a9f3
google_apis-25_r1.zip
@@ -1156,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1