diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4d5f0f27e5c5..a6a07deae497 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -58,11 +58,11 @@
/doc/languages-frameworks/python.section.md @FRidh
# Haskell
-/pkgs/development/compilers/ghc @peti @basvandijk
-/pkgs/development/haskell-modules @peti @basvandijk
-/pkgs/development/haskell-modules/default.nix @peti @basvandijk
-/pkgs/development/haskell-modules/generic-builder.nix @peti @basvandijk
-/pkgs/development/haskell-modules/hoogle.nix @peti @basvandijk
+/pkgs/development/compilers/ghc @basvandijk
+/pkgs/development/haskell-modules @basvandijk
+/pkgs/development/haskell-modules/default.nix @basvandijk
+/pkgs/development/haskell-modules/generic-builder.nix @basvandijk
+/pkgs/development/haskell-modules/hoogle.nix @basvandijk
# Perl
/pkgs/development/interpreters/perl @volth
diff --git a/doc/Makefile b/doc/Makefile
index cd6d7eb8d1c8..5badfe4138d4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -78,15 +78,14 @@ manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml function
nix-instantiate --eval \
-E '(import ../lib).version' > .version
-function_locations := $(shell nix-build --no-out-link ./lib-function-locations.nix)
-
functions/library/locations.xml:
- ln -s $(function_locations) ./functions/library/locations.xml
+ nix-build ./lib-function-locations.nix \
+ --out-link $@
-functions/library/generated:
+functions/library/generated: functions/library/locations.xml
nix-build ./lib-function-docs.nix \
- --arg locationsXml $(function_locations)\
- --out-link ./functions/library/generated
+ --arg locationsXml $< \
+ --out-link $@
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index dbaf6f104ec0..b7844da195d7 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -12,11 +12,12 @@
computing power and memory to compile their own programs. One might think
that cross-compilation is a fairly niche concern. However, there are
significant advantages to rigorously distinguishing between build-time and
- run-time environments! This applies even when one is developing and
- deploying on the same machine. Nixpkgs is increasingly adopting the opinion
- that packages should be written with cross-compilation in mind, and nixpkgs
- should evaluate in a similar way (by minimizing cross-compilation-specific
- special cases) whether or not one is cross-compiling.
+ run-time environments! Significant, because the benefits apply even when one
+ is developing and deploying on the same machine. Nixpkgs is increasingly
+ adopting the opinion that packages should be written with cross-compilation
+ in mind, and nixpkgs should evaluate in a similar way (by minimizing
+ cross-compilation-specific special cases) whether or not one is
+ cross-compiling.
@@ -30,7 +31,7 @@
Packaging in a cross-friendly manner
-
+
Platform parameters
@@ -218,8 +219,20 @@
-
- Specifying Dependencies
+
+ Theory of dependency categorization
+
+
+
+ This is a rather philosophical description that isn't very
+ Nixpkgs-specific. For an overview of all the relevant attributes given to
+ mkDerivation , see
+
+
In this section we explore the relationship between both runtime and
@@ -227,84 +240,98 @@
- A runtime dependency between 2 packages implies that between them both the
- host and target platforms match. This is directly implied by the meaning of
- "host platform" and "runtime dependency": The package dependency exists
- while both packages are running on a single host platform.
+ A run time dependency between two packages requires that their host
+ platforms match. This is directly implied by the meaning of "host platform"
+ and "runtime dependency": The package dependency exists while both packages
+ are running on a single host platform.
- A build time dependency, however, implies a shift in platforms between the
- depending package and the depended-on package. The meaning of a build time
- dependency is that to build the depending package we need to be able to run
- the depended-on's package. The depending package's build platform is
- therefore equal to the depended-on package's host platform. Analogously,
- the depending package's host platform is equal to the depended-on package's
- target platform.
+ A build time dependency, however, has a shift in platforms between the
+ depending package and the depended-on package. "build time dependency"
+ means that to build the depending package we need to be able to run the
+ depended-on's package. The depending package's build platform is therefore
+ equal to the depended-on package's host platform.
- In this manner, given the 3 platforms for one package, we can determine the
- three platforms for all its transitive dependencies. This is the most
- important guiding principle behind cross-compilation with Nixpkgs, and will
- be called the sliding window principle .
+ If both the dependency and depending packages aren't compilers or other
+ machine-code-producing tools, we're done. And indeed
+ buildInputs and nativeBuildInputs
+ have covered these simpler build-time and run-time (respectively) changes
+ for many years. But if the dependency does produce machine code, we might
+ need to worry about its target platform too. In principle, that target
+ platform might be any of the depending package's build, host, or target
+ platforms, but we prohibit dependencies from a "later" platform to an
+ earlier platform to limit confusion because we've never seen a legitimate
+ use for them.
- Some examples will make this clearer. If a package is being built with a
- (build, host, target) platform triple of (foo,
- bar, bar) , then its build-time dependencies would have a triple
- of (foo, foo, bar) , and those
- packages' build-time dependencies would have a triple of
- (foo, foo, foo) . In other words, it should take two
- "rounds" of following build-time dependency edges before one reaches a
- fixed point where, by the sliding window principle, the platform triple no
- longer changes. Indeed, this happens with cross-compilation, where only
- rounds of native dependencies starting with the second necessarily coincide
- with native packages.
+ Finally, if the depending package is a compiler or other
+ machine-code-producing tool, it might need dependencies that run at "emit
+ time". This is for compilers that (regrettably) insist on being built
+ together with their source langauges' standard libraries. Assuming build !=
+ host != target, a run-time dependency of the standard library cannot be run
+ at the compiler's build time or run time, but only at the run time of code
+ emitted by the compiler.
-
-
- The depending package's target platform is unconstrained by the sliding
- window principle, which makes sense in that one can in principle build
- cross compilers targeting arbitrary platforms.
-
-
-
- How does this work in practice? Nixpkgs is now structured so that
- build-time dependencies are taken from buildPackages ,
- whereas run-time dependencies are taken from the top level attribute set.
- For example, buildPackages.gcc should be used at
- build-time, while gcc should be used at run-time. Now,
- for most of Nixpkgs's history, there was no
- buildPackages , and most packages have not been
- refactored to use it explicitly. Instead, one can use the six
- (gasp ) attributes used for specifying dependencies as
- documented in callPackage , and then mkDerivation
- for each of four attributes pulls the right derivation out. This splicing
- can be skipped when not cross-compiling as the package sets are the same,
- but is a bit slow for cross-compiling. Because of this, a
- best-of-both-worlds solution is in the works with no splicing or explicit
- access of buildPackages needed. For now, feel free to
- use either method.
+ Putting this all together, that means we have dependencies in the form
+ "host → target", in at most the following six combinations:
+
+ Possible dependency types
+
+
+ Dependency's host platform
+ Dependency's target platform
+
+
+
+
+ build
+ build
+
+
+ build
+ host
+
+
+ build
+ target
+
+
+ host
+ host
+
+
+ host
+ target
+
+
+ target
+ target
+
+
+
-
-
- There is also a "backlink" targetPackages , yielding a
- package set whose buildPackages is the current package
- set. This is a hack, though, to accommodate compilers with lousy build
- systems. Please do not use this unless you are absolutely sure you are
- packaging such a compiler and there is no other way.
-
-
+
+ Some examples will make this table clearer. Suppose there's some package
+ that is being built with a (build, host, target)
+ platform triple of (foo, bar, baz) . If it has a
+ build-time library dependency, that would be a "host → build" dependency
+ with a triple of (foo, foo, *) (the target platform is
+ irrelevant). If it needs a compiler to be built, that would be a "build →
+ host" dependency with a triple of (foo, foo, *) (the
+ target platform is irrelevant). That compiler, would be built with another
+ compiler, also "build → host" dependency, with a triple of (foo,
+ foo, foo) .
+
-
+
Cross packaging cookbook
@@ -450,21 +477,202 @@ nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os>
Cross-compilation infrastructure
-
- To be written.
-
+
+ Implementation of dependencies
-
- If one explores Nixpkgs, they will see derivations with names like
- gccCross . Such *Cross derivations is
- a holdover from before we properly distinguished between the host and
- target platforms—the derivation with "Cross" in the name covered the
- build = host != target case, while the other covered the
- host = target , with build platform the same or not based
- on whether one was using its .nativeDrv or
- .crossDrv . This ugliness will disappear soon.
+ The categorizes of dependencies developed in
+ mkDerivation , as
+ documented in depsFooBar , with exceptions for backwards
+ compatibility that depsBuildHost is instead called
+ nativeBuildInputs and depsHostTarget
+ is instead called buildInputs . Nixpkgs is now structured
+ so that each depsFooBar is automatically taken from
+ pkgsFooBar . (These pkgsFooBar s are
+ quite new, so there is no special case for
+ nativeBuildInputs and buildInputs .)
+ For example, pkgsBuildHost.gcc should be used at
+ build-time, while pkgsHostTarget.gcc should be used at
+ run-time.
-
+
+
+ Now, for most of Nixpkgs's history, there were no
+ pkgsFooBar attributes, and most packages have not been
+ refactored to use it explicitly. Prior to those, there were just
+ buildPackages , pkgs , and
+ targetPackages . Those are now redefined as aliases to
+ pkgsBuildHost , pkgsHostTarget , and
+ pkgsTargetTarget . It is acceptable, even
+ recommended, to use them for libraries to show that the host platform is
+ irrelevant.
+
+
+
+ But before that, there was just pkgs , even though both
+ buildInputs and nativeBuildInputs
+ existed. [Cross barely worked, and those were implemented with some hacks
+ on mkDerivation to override dependencies.] What this
+ means is the vast majority of packages do not use any explicit package set
+ to populate their dependencies, just using whatever
+ callPackage gives them even if they do correctly sort
+ their dependencies into the multiple lists described above. And indeed,
+ asking that users both sort their dependencies, and
+ take them from the right attribute set, is both too onerous and redundant,
+ so the recommended approach (for now) is to continue just categorizing by
+ list and not using an explicit package set.
+
+
+
+ To make this work, we "splice" together the six
+ pkgsFooBar package sets and have
+ callPackage actually take its arguments from that. This
+ is currently implemented in pkgs/top-level/splice.nix .
+ mkDerivation then, for each dependency attribute, pulls
+ the right derivation out from the splice. This splicing can be skipped when
+ not cross-compiling as the package sets are the same, but still is a bit
+ slow for cross-compiling. We'd like to do something better, but haven't
+ come up with anything yet.
+
+
+
+
+ Bootstrapping
+
+
+ Each of the package sets described above come from a single bootstrapping
+ stage. While pkgs/top-level/default.nix , coordinates
+ the composition of stages at a high level,
+ pkgs/top-level/stage.nix "ties the knot" (creates the
+ fixed point) of each stage. The package sets are defined per-stage however,
+ so they can be thought of as edges between stages (the nodes) in a graph.
+ Compositions like pkgsBuildTarget.targetPackages can be
+ thought of as paths to this graph.
+
+
+
+ While there are many package sets, and thus many edges, the stages can also
+ be arranged in a linear chain. In other words, many of the edges are
+ redundant as far as connectivity is concerned. This hinges on the type of
+ bootstrapping we do. Currently for cross it is:
+
+
+
+ (native, native, native)
+
+
+
+
+ (native, native, foreign)
+
+
+
+
+ (native, foreign, foreign)
+
+
+
+ In each stage, pkgsBuildHost refers the the previous
+ stage, pkgsBuildBuild refers to the one before that, and
+ pkgsHostTarget refers to the current one, and
+ pkgsTargetTarget refers to the next one. When there is
+ no previous or next stage, they instead refer to the current stage. Note
+ how all the invariants regarding the mapping between dependency and depending
+ packages' build host and target platforms are preserved.
+ pkgsBuildTarget and pkgsHostHost are
+ more complex in that the stage fitting the requirements isn't always a
+ fixed chain of "prevs" and "nexts" away (modulo the "saturating"
+ self-references at the ends). We just special case each instead. All the primary
+ edges are implemented is in pkgs/stdenv/booter.nix ,
+ and secondarily aliases in pkgs/top-level/stage.nix .
+
+
+
+
+ Note the native stages are bootstrapped in legacy ways that predate the
+ current cross implementation. This is why the the bootstrapping stages
+ leading up to the final stages are ignored inthe previous paragraph.
+
+
+
+
+ If one looks at the 3 platform triples, one can see that they overlap such
+ that one could put them together into a chain like:
+
+(native, native, native, foreign, foreign)
+
+ If one imagines the saturating self references at the end being replaced
+ with infinite stages, and then overlays those platform triples, one ends up
+ with the infinite tuple:
+
+(native..., native, native, native, foreign, foreign, foreign...)
+
+ On can then imagine any sequence of platforms such that there are bootstrap
+ stages with their 3 platforms determined by "sliding a window" that is the
+ 3 tuple through the sequence. This was the original model for
+ bootstrapping. Without a target platform (assume a better world where all
+ compilers are multi-target and all standard libraries are built in their
+ own derivation), this is sufficient. Conversely if one wishes to cross
+ compile "faster", with a "Canadian Cross" bootstraping stage where
+ build != host != target , more bootstrapping stages are
+ needed since no sliding window providess the pesky
+ pkgsBuildTarget package set since it skips the Canadian
+ cross stage's "host".
+
+
+
+
+ It is much better to refer to buildPackages than
+ targetPackages , or more broadly package sets that do
+ not mention "target". There are three reasons for this.
+
+
+ First, it is because bootstrapping stages do not have a unique
+ targetPackages . For example a (x86-linux,
+ x86-linux, arm-linux) and (x86-linux, x86-linux,
+ x86-windows) package set both have a (x86-linux,
+ x86-linux, x86-linux) package set. Because there is no canonical
+ targetPackages for such a native (build ==
+ host == target ) package set, we set their
+ targetPackages
+
+
+ Second, it is because this is a frequent source of hard-to-follow
+ "infinite recursions" / cycles. When only package sets that don't mention
+ target are used, the package set forms a directed acyclic graph. This
+ means that all cycles that exist are confined to one stage. This means
+ they are a lot smaller, and easier to follow in the code or a backtrace. It
+ also means they are present in native and cross builds alike, and so more
+ likely to be caught by CI and other users.
+
+
+ Thirdly, it is because everything target-mentioning only exists to
+ accommodate compilers with lousy build systems that insist on the compiler
+ itself and standard library being built together. Of course that is bad
+ because bigger derivations means longer rebuilds. It is also problematic because
+ it tends to make the standard libraries less like other libraries than
+ they could be, complicating code and build systems alike. Because of the
+ other problems, and because of these innate disadvantages, compilers ought
+ to be packaged another way where possible.
+
+
+
+
+
+ If one explores Nixpkgs, they will see derivations with names like
+ gccCross . Such *Cross derivations is
+ a holdover from before we properly distinguished between the host and
+ target platforms—the derivation with "Cross" in the name covered the
+ build = host != target case, while the other covered
+ the host = target , with build platform the same or not
+ based on whether one was using its .nativeDrv or
+ .crossDrv . This ugliness will disappear soon.
+
+
+
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index 75db0bd3918c..cb32db74b424 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -417,10 +417,11 @@ pkgs.dockerTools.buildLayeredImage {
pullImage {
imageName = "nixos/nix";
+
+ finalImageName , if specified, this is the name of the
+ image to be created. Note it is never used to fetch the image since we
+ prefer to rely on the immutable digest ID. By default it's equal to
+ imageName .
+
+
+
finalImageTag , if specified, this is the tag of the
image to be created. Note it is never used to fetch the image since we
@@ -458,19 +467,19 @@ sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
latest .
-
+
sha256 is the checksum of the whole fetched image. This
argument is required.
-
+
os , if specified, is the operating system of the
fetched image. By default it's linux .
-
+
arch , if specified, is the cpu architecture of the
fetched image. By default it's x86_64 .
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index d18e282c5bd3..d0247e081f99 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -101,6 +101,13 @@
contain $outputBin and $outputLib are
also added. (See
+
+
+ In some cases it may be desirable to combine different outputs under a
+ single store path. A function symlinkJoin can be used to
+ do this. (Note that it may negate some closure size benefits of using a
+ multiple-output package.)
+
Writing a split derivation
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index dfdada3d28c2..169f70283e6d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -883,6 +883,33 @@ citrix_receiver.override {
On NixOS it can be installed using the following expression:
{ pkgs, ... }: {
fonts.fonts = with pkgs; [ noto-fonts-emoji ];
+}
+
+
+
+
+ DLib
+
+
+
+
+
+ Compiling without AVX support
+
+
+ Especially older CPUs don't support
+ Advanced Vector Extensions ) instructions that are used by DLib to
+ optimize their algorithms.
+
+
+
+ On the affected hardware errors like Illegal instruction will occur.
+ In those cases AVX support needs to be disabled:
+self: super: {
+ dlib = super.dlib.override { avxSupport = false; };
}
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 029299a50b1e..6e3b6face3a5 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -189,7 +189,8 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
- The PRNUMBER should be replaced by the number at the end
of the pull request title. You can also provide the full github pull
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a3990dec052f..74f815fc1d79 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -222,9 +222,10 @@ genericBuild
But even if one is not cross compiling, the platforms imply whether or not
the dependency is needed at run-time or build-time, a concept that makes
- perfect sense outside of cross compilation. For now, the run-time/build-time
- distinction is just a hint for mental clarity, but in the future it perhaps
- could be enforced.
+ perfect sense outside of cross compilation. By default, the
+ run-time/build-time distinction is just a hint for mental clarity, but with
+ strictDeps set it is mostly enforced even in the native
+ case.
@@ -348,7 +349,10 @@ let f(h, h + 1, i) = i + h
Overall, the unifying theme here is that propagation shouldn't be
introducing transitive dependencies involving platforms the depending
- package is unaware of. The offset bounds checking and definition of
+ package is unaware of. [One can imagine the dependending package asking for
+ dependencies with the platforms it knows about; other platforms it doesn't
+ know how to ask for. The platform description in that scenario is a kind of
+ unforagable capability.] The offset bounds checking and definition of
mapOffset together ensure that this is the case.
Discovering a new offset is discovering a new platform, and since those
platforms weren't in the derivation "spec" of the needing package, they
@@ -2633,21 +2637,20 @@ addEnvHooks "$hostOffset" myBashFunction
happens. It prevents nix from cleaning up the build environment
immediately and allows the user to attach to a build environment using
the cntr command. Upon build error it will print
- instructions on how to use cntr , which can be used
- to enter the environment for debugging. Installing cntr and
- running the command will provide shell access to the build sandbox of
- failed build. At /var/lib/cntr the sandboxed
- 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 not
- be the case when remote builders are enabled. cntr is
- only supported on Linux-based platforms. To use it first add
- cntr to your
- environment.systemPackages on NixOS or alternatively
- to the root user on non-NixOS systems. Then in the package that is
- supposed to be inspected, add breakpointHook to
- nativeBuildInputs .
+ instructions on how to use cntr , which can be used to
+ enter the environment for debugging. Installing cntr and running the
+ command will provide shell access to the build sandbox of failed build.
+ At /var/lib/cntr the sandboxed 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 not be the case when
+ remote builders are enabled. cntr is only supported
+ on Linux-based platforms. To use it first add cntr to
+ your environment.systemPackages on NixOS or
+ alternatively to the root user on non-NixOS systems. Then in the package
+ that is supposed to be inspected, add breakpointHook
+ to nativeBuildInputs .
nativeBuildInputs = [ breakpointHook ];
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index 33abfb634ea2..bc090fd757ce 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -354,23 +354,22 @@ Additional information.
Tested compilation of all pkgs that depend on this change using <command>nix-review</command>
- If you are updating a package's version, you can use nix-review to make sure all
- packages that depend on the updated package still compile correctly.
- The nix-review utility can look for and build all dependencies
- either based on uncommited changes with the wip option or
- specifying a github pull request number.
+ If you are updating a package's version, you can use nix-review to make
+ sure all packages that depend on the updated package still compile
+ correctly. The nix-review utility can look for and build
+ all dependencies either based on uncommited changes with the
+ wip option or specifying a github pull request number.
- review changes from pull request number 12345:
- nix-shell -p nix-review --run "nix-review pr 12345"
+ review changes from pull request number 12345:
+nix-shell -p nix-review --run "nix-review pr 12345"
- review uncommitted changes:
- nix-shell -p nix-review --run "nix-review wip"
+ review uncommitted changes:
+nix-shell -p nix-review --run "nix-review wip"
-
diff --git a/lib/lists.nix b/lib/lists.nix
index be541427c247..9f2ccc00cafe 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -7,7 +7,7 @@ let
in
rec {
- inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
+ inherit (builtins) head tail length isList elemAt concatLists filter elem genList map;
/* Create a list consisting of a single element. `singleton x` is
sometimes more convenient with respect to indentation than `[x]`
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 090a3f700d4c..52b9bd46e600 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -34,6 +34,7 @@ rec {
else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
+ else if final.isMsp430 then "newlib"
else if final.isAvr then "avrlibc"
else if final.isNetBSD then "nblibc"
# TODO(@Ericson2314) think more about other operating systems
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 0c9a3b4a63f5..28a8d3cb9eb9 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -102,6 +102,11 @@ rec {
riscv64 = riscv "64";
riscv32 = riscv "32";
+ msp430 = {
+ config = "msp430-elf";
+ libc = "newlib";
+ };
+
avr = {
config = "avr";
};
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 932f8fd1e536..f8d5ca84d7aa 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -20,6 +20,7 @@ rec {
isRiscV = { cpu = { family = "riscv"; }; };
isSparc = { cpu = { family = "sparc"; }; };
isWasm = { cpu = { family = "wasm"; }; };
+ isMsp430 = { cpu = { family = "msp430"; }; };
isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index fab50bc0ebd7..8cc7d3ae271f 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -109,6 +109,7 @@ rec {
alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
+ msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; };
avr = { bits = 8; family = "avr"; };
};
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e59cf106a75b..87892f72121c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -147,6 +147,11 @@
github = "aepsil0n";
name = "Eduard Bopp";
};
+ aerialx = {
+ email = "aaron+nixos@aaronlindsay.com";
+ github = "AerialX";
+ name = "Aaron Lindsay";
+ };
aespinosa = {
email = "allan.espinosa@outlook.com";
github = "aespinosa";
@@ -335,6 +340,11 @@
github = "andrew-d";
name = "Andrew Dunham";
};
+ andrewchambers = {
+ email = "ac@acha.ninja";
+ github = "andrewchambers";
+ name = "Andrew Chambers";
+ };
andrewrk = {
email = "superjoe30@gmail.com";
github = "andrewrk";
@@ -5391,4 +5401,9 @@
github = "minijackson";
name = "Rémi Nicole";
};
+ shazow = {
+ email = "andrey.petrov@shazow.net";
+ github = "shazow";
+ name = "Andrey Petrov";
+ };
}
diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh
index 1357f87aaa5d..a267a5fa8715 100755
--- a/maintainers/scripts/fetch-kde-qt.sh
+++ b/maintainers/scripts/fetch-kde-qt.sh
@@ -14,12 +14,13 @@ fi
tmp=$(mktemp -d)
pushd $tmp >/dev/null
-wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null
+wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null
+find -type f -name '*.mirrorlist' -delete
csv=$(mktemp)
find . -type f | while read src; do
# Sanitize file name
- filename=$(basename "$src" | tr '@' '_')
+ filename=$(gawk '{ print $2 }' "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}"
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
@@ -38,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
- url="${src:2}"
- sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+ url="$(dirname "${src:2}")/$filename"
+ sha256=$(gawk '{ print $1 }' "$src")
cat >>"$SRCS" <...
The first column in the output is the attribute name ,
- such as nixos.thunderbird . (The nixos
- prefix allows distinguishing between different channels that you might have.)
+ such as nixos.thunderbird .
+
+
+ Note: the nixos prefix tells us that we want to get the
+ package from the nixos channel and works only in CLI tools.
+
+ In declarative configuration use pkgs prefix (variable).
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 7d40637df931..7c94f6e9473e 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -68,6 +68,17 @@
+
+
+ There is now a set of confinement options for
+ systemd.services , which allows to restrict services
+ into a
+ chroot
+ 2
+ ed environment that only contains the store paths from
+ the runtime closure of the service.
+
+
@@ -516,6 +527,13 @@
Graylog for details.
+
+
+ The option users.ldap.bind.password was renamed to users.ldap.bind.passwordFile ,
+ and needs to be readable by the nslcd user.
+ Same applies to the new users.ldap.daemon.rootpwmodpwFile option.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index cc0d97023f96..2cfaec49c02e 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -42,6 +42,39 @@
+
+ Backward Incompatibilities
+
+
+ When upgrading from a previous release, please be aware of the following
+ incompatible changes:
+
+
+
+
+
+ Buildbot no longer supports Python 2, as support was dropped upstream in
+ version 2.0.0. Configurations may need to be modified to make them
+ compatible with Python 3.
+
+
+
+
+ PostgreSQL now uses
+ /run/postgresql as its socket
+ directory instead of /tmp . So
+ if you run an application like eg. Nextcloud, where you need to use
+ the Unix socket path as the database host name, you need to change it
+ accordingly.
+
+
+
+
+
+
+
+ The vlc package gained support for Chromecast
+ streaming, enabled by default. TCP port 8010 must be open for it to work,
+ so something like networking.firewall.allowedTCPPorts = [ 8010
+ ]; may be required in your configuration. Also consider enabling
+
+
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index f65a3fc50d54..e008497a2a6e 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -27,25 +27,29 @@ let
'';
};
- nslcdConfig = {
- target = "nslcd.conf";
- source = writeText "nslcd.conf" ''
- uid nslcd
- gid nslcd
- uri ${cfg.server}
- base ${cfg.base}
- timelimit ${toString cfg.timeLimit}
- bind_timelimit ${toString cfg.bind.timeLimit}
- ${optionalString (cfg.bind.distinguishedName != "")
- "binddn ${cfg.bind.distinguishedName}" }
- ${optionalString (cfg.daemon.rootpwmoddn != "")
- "rootpwmoddn ${cfg.daemon.rootpwmoddn}" }
- ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig }
- '';
- };
+ nslcdConfig = writeText "nslcd.conf" ''
+ uid nslcd
+ gid nslcd
+ uri ${cfg.server}
+ base ${cfg.base}
+ timelimit ${toString cfg.timeLimit}
+ bind_timelimit ${toString cfg.bind.timeLimit}
+ ${optionalString (cfg.bind.distinguishedName != "")
+ "binddn ${cfg.bind.distinguishedName}" }
+ ${optionalString (cfg.daemon.rootpwmoddn != "")
+ "rootpwmoddn ${cfg.daemon.rootpwmoddn}" }
+ ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig }
+ '';
- insertLdapPassword = !config.users.ldap.daemon.enable &&
- config.users.ldap.bind.distinguishedName != "";
+ # nslcd normally reads configuration from /etc/nslcd.conf.
+ # this file might contain secrets. We append those at runtime,
+ # so redirect its location to something more temporary.
+ nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } ''
+ mkdir -p $out/bin
+ makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \
+ --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \
+ --set NIX_REDIRECTS "/etc/nslcd.conf=/run/nslcd/nslcd.conf"
+ '';
in
@@ -139,13 +143,13 @@ in
'';
};
- rootpwmodpw = mkOption {
+ rootpwmodpwFile = mkOption {
default = "";
example = "/run/keys/nslcd.rootpwmodpw";
type = types.str;
description = ''
- The path to a file containing the credentials with which
- to bind to the LDAP server if the root user tries to change a user's password
+ The path to a file containing the credentials with which to bind to
+ the LDAP server if the root user tries to change a user's password.
'';
};
};
@@ -161,7 +165,7 @@ in
'';
};
- password = mkOption {
+ passwordFile = mkOption {
default = "/etc/ldap/bind.password";
type = types.str;
description = ''
@@ -220,14 +224,14 @@ in
config = mkIf cfg.enable {
- environment.etc = if cfg.daemon.enable then [nslcdConfig] else [ldapConfig];
+ environment.etc = optional (!cfg.daemon.enable) ldapConfig;
- system.activationScripts = mkIf insertLdapPassword {
+ system.activationScripts = mkIf (!cfg.daemon.enable) {
ldap = stringAfter [ "etc" "groups" "users" ] ''
- if test -f "${cfg.bind.password}" ; then
+ if test -f "${cfg.bind.passwordFile}" ; then
umask 0077
conf="$(mktemp)"
- printf 'bindpw %s\n' "$(cat ${cfg.bind.password})" |
+ printf 'bindpw %s\n' "$(cat ${cfg.bind.passwordFile})" |
cat ${ldapConfig.source} - >"$conf"
mv -fT "$conf" /etc/ldap.conf
fi
@@ -251,7 +255,6 @@ in
};
systemd.services = mkIf cfg.daemon.enable {
-
nslcd = {
wantedBy = [ "multi-user.target" ];
@@ -259,32 +262,32 @@ in
umask 0077
conf="$(mktemp)"
{
- cat ${nslcdConfig.source}
- test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.password}' ||
- printf 'bindpw %s\n' "$(cat '${cfg.bind.password}')"
- test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpw}' ||
- printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpw}')"
+ cat ${nslcdConfig}
+ test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.passwordFile}' ||
+ printf 'bindpw %s\n' "$(cat '${cfg.bind.passwordFile}')"
+ test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpwFile}' ||
+ printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpwFile}')"
} >"$conf"
- mv -fT "$conf" /etc/nslcd.conf
+ mv -fT "$conf" /run/nslcd/nslcd.conf
'';
-
- # NOTE: because one cannot pass a custom config path to `nslcd`
- # (which is only able to use `/etc/nslcd.conf`)
- # changes in `nslcdConfig` won't change `serviceConfig`,
- # and thus won't restart `nslcd`.
- # Therefore `restartTriggers` is used on `/etc/nslcd.conf`.
- restartTriggers = [ nslcdConfig.source ];
+ restartTriggers = [ "/run/nslcd/nslcd.conf" ];
serviceConfig = {
- ExecStart = "${nss_pam_ldapd}/sbin/nslcd";
+ ExecStart = "${nslcdWrapped}/bin/nslcd";
Type = "forking";
- PIDFile = "/run/nslcd/nslcd.pid";
Restart = "always";
+ User = "nslcd";
+ Group = "nslcd";
RuntimeDirectory = [ "nslcd" ];
+ PIDFile = "/run/nslcd/nslcd.pid";
};
};
};
};
+
+ imports =
+ [ (mkRenamedOptionModule [ "users" "ldap" "bind" "password"] [ "users" "ldap" "bind" "passwordFile"])
+ ];
}
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index d71e06202e30..fd780be20825 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -88,7 +88,7 @@ let
# result in incorrect boot entries.
baseIsolinuxCfg = ''
- SERIAL 0 38400
+ SERIAL 0 115200
TIMEOUT ${builtins.toString syslinuxTimeout}
UI vesamenu.c32
MENU TITLE NixOS
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0f3c9d0c5627..8e216776a8a3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -172,6 +172,7 @@
./security/rtkit.nix
./security/wrappers/default.nix
./security/sudo.nix
+ ./security/systemd-confinement.nix
./services/admin/oxidized.nix
./services/admin/salt/master.nix
./services/admin/salt/minion.nix
@@ -349,6 +350,7 @@
./services/mail/exim.nix
./services/mail/freepops.nix
./services/mail/mail.nix
+ ./services/mail/mailcatcher.nix
./services/mail/mailhog.nix
./services/mail/mlmmj.nix
./services/mail/offlineimap.nix
@@ -630,6 +632,7 @@
./services/networking/prosody.nix
./services/networking/quagga.nix
./services/networking/quassel.nix
+ ./services/networking/quicktun.nix
./services/networking/racoon.nix
./services/networking/radicale.nix
./services/networking/radvd.nix
@@ -880,6 +883,7 @@
./virtualisation/container-config.nix
./virtualisation/containers.nix
./virtualisation/docker.nix
+ ./virtualisation/docker-containers.nix
./virtualisation/ecs-agent.nix
./virtualisation/libvirtd.nix
./virtualisation/lxc.nix
diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix
index 5f8a44a9848e..47b9d1ccb1f6 100644
--- a/nixos/modules/programs/browserpass.nix
+++ b/nixos/modules/programs/browserpass.nix
@@ -4,15 +4,34 @@ with lib;
{
- ###### interface
- options = {
- programs.browserpass.enable = mkEnableOption "the NativeMessaging configuration for Chromium, Chrome, and Vivaldi.";
- };
+ options.programs.browserpass.enable = mkEnableOption "Browserpass native messaging host";
- ###### implementation
config = mkIf config.programs.browserpass.enable {
- environment.systemPackages = [ pkgs.browserpass ];
- environment.etc = {
+ environment.etc = let
+ appId = "com.github.browserpass.native.json";
+ source = part: "${pkgs.browserpass}/lib/browserpass/${part}/${appId}";
+ in {
+ # chromium
+ "chromium/native-messaging-hosts/${appId}".source = source "hosts/chromium";
+ "chromium/policies/managed/${appId}".source = source "policies/chromium";
+
+ # chrome
+ "opt/chrome/native-messaging-hosts/${appId}".source = source "hosts/chromium";
+ "opt/chrome/policies/managed/${appId}".source = source "policies/chromium";
+
+ # vivaldi
+ "opt/vivaldi/native-messaging-hosts/${appId}".source = source "hosts/chromium";
+ "opt/vivaldi/policies/managed/${appId}".source = source "policies/chromium";
+
+ # brave
+ "opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium";
+ "opt/brave/policies/managed/${appId}".source = source "policies/chromium";
+ }
+ # As with the v2 backwards compatibility in the pkgs.browserpass
+ # declaration, this part can be removed once the browser extension
+ # auto-updates to v3 (planned 2019-04-13, see
+ # https://github.com/browserpass/browserpass-native/issues/31)
+ // {
"chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
"chromium/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json";
"opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 7fb58a2b8002..325f92308402 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -4,26 +4,12 @@ with lib;
{
imports = [
- # !!! These were renamed the other way, but got reverted later.
- # !!! Drop these before 18.09 is released.
- (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ])
- (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ])
-
- (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])
- (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])
- (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ])
- (mkRenamedOptionModule [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ])
- (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
-
- (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
-
- (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
(config:
let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
@@ -33,11 +19,7 @@ with lib;
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" ])
- (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
(mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
- (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
@@ -54,7 +36,6 @@ with lib;
(mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])
(mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")
(mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])
@@ -64,10 +45,6 @@ with lib;
(mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
- (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
(mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
(mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
@@ -91,82 +68,31 @@ with lib;
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])
# Old Grub-related options.
- (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
- (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
(mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])
(mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])
- # smartd
- (mkRenamedOptionModule [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ])
-
# OpenSSH
- (mkRenamedOptionModule [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ])
(mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
- (mkRenamedOptionModule [ "services" "sshd" "allowSFTP" ] [ "services" "openssh" "allowSFTP" ])
- (mkRenamedOptionModule [ "services" "sshd" "forwardX11" ] [ "services" "openssh" "forwardX11" ])
- (mkRenamedOptionModule [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ])
- (mkRenamedOptionModule [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ])
- (mkRenamedOptionModule [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ])
- (mkRenamedOptionModule [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ])
(mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
- # VirtualBox
- (mkRenamedOptionModule [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ])
- (mkRenamedOptionModule [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ])
- (mkRenamedOptionModule [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ])
- (mkRenamedOptionModule [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
- (mkRenamedOptionModule [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
- (mkRenamedOptionModule [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ])
- (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
- (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
-
# libvirtd
(mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
"Set the option `virtualisation.libvirtd.qemuPackage' instead.")
- # Tarsnap
- (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
-
# ibus
(mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
- # proxy
- (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])
-
# sandboxing
(mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
(mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
- # KDE
- (mkRenamedOptionModule [ "kde" "extraPackages" ] [ "environment" "systemPackages" ])
- (mkRenamedOptionModule [ "environment" "kdePackages" ] [ "environment" "systemPackages" ])
-
- # Multiple efi bootloaders now
- (mkRenamedOptionModule [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ])
-
- # NixOS environment changes
- # !!! this hardcodes bash, could we detect from config which shell is actually used?
- (mkRenamedOptionModule [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ])
-
- (mkRenamedOptionModule [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ])
- (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
- (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ])
- (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ])
(mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])
- (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ])
-
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
# opendkim
(mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
- # XBMC
- (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
- (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
-
- (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ])
-
# Enlightenment
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 14bf118f2d84..997328ad9e6a 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -76,7 +76,7 @@ in
};
failmode = mkOption {
- type = types.enum [ "safe" "enum" ];
+ type = types.enum [ "safe" "secure" ];
default = "safe";
description = ''
On service or configuration errors that prevent Duo
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 03d2f899f2ab..46ce274a2a9a 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -48,6 +48,16 @@ let
'';
};
+ yubicoAuth = mkOption {
+ default = config.security.pam.yubico.enable;
+ type = types.bool;
+ description = ''
+ If set, users listed in
+ ~/.yubico/authorized_yubikeys
+ are able to log in with the asociated Yubikey tokens.
+ '';
+ };
+
googleAuthenticator = {
enable = mkOption {
default = false;
@@ -340,6 +350,8 @@ let
"auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
"auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
+ ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
+ "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so id=${toString yubi.id} ${optionalString yubi.debug "debug"}"}
'' +
# Modules in this block require having the password set in PAM_AUTHTOK.
# pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@@ -636,6 +648,54 @@ in
};
};
+ security.pam.yubico = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enables Yubico PAM (yubico-pam ) module.
+
+ If set, users listed in
+ ~/.yubico/authorized_yubikeys
+ are able to log in with the associated Yubikey tokens.
+
+ The file must have only one line:
+ username:yubikey_token_id1:yubikey_token_id2
+ More information can be found
+ pam.conf
+ 5
+
+ for better understanding of this option.
+ '';
+ };
+ id = mkOption {
+ example = "42";
+ type = types.string;
+ description = "client id";
+ };
+
+ debug = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Debug output to stderr.
+ '';
+ };
+ };
+
security.pam.enableEcryptfs = mkOption {
default = false;
description = ''
diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix
new file mode 100644
index 000000000000..cd4eb81dbe19
--- /dev/null
+++ b/nixos/modules/security/systemd-confinement.nix
@@ -0,0 +1,199 @@
+{ config, pkgs, lib, ... }:
+
+let
+ toplevelConfig = config;
+ inherit (lib) types;
+ inherit (import ../system/boot/systemd-lib.nix {
+ inherit config pkgs lib;
+ }) mkPathSafeName;
+in {
+ options.systemd.services = lib.mkOption {
+ type = types.attrsOf (types.submodule ({ name, config, ... }: {
+ options.confinement.enable = lib.mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set, all the required runtime store paths for this service are
+ bind-mounted into a tmpfs -based
+ chroot
+ 2
+ .
+ '';
+ };
+
+ options.confinement.fullUnit = lib.mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to include the full closure of the systemd unit file into the
+ chroot, instead of just the dependencies for the executables.
+
+ While it may be tempting to just enable this option to
+ make things work quickly, please be aware that this might add paths
+ to the closure of the chroot that you didn't anticipate. It's better
+ to use confinement.packages to explicitly add additional store paths to the
+ chroot. serviceConfig.${optName} ";
+ in ''
+ Additional packages or strings with context to add to the closure of
+ the chroot. By default, this includes all the packages from the
+ ${lib.concatMapStringsSep ", " mkScOption [
+ "ExecReload" "ExecStartPost" "ExecStartPre" "ExecStop"
+ "ExecStopPost"
+ ]} and ${mkScOption "ExecStart"} options. If you want to have all the
+ dependencies of this systemd unit, you can use
+ confinement.fullUnit .
+
+ The store paths listed in path are
+ not included in the closure as
+ well as paths from other options except those listed
+ above. /bin/sh inside
+ the chroot. If this is set to null , no
+ /bin/sh is provided at all.
+
+ This is useful for some applications, which for example use the
+
+ system
+ 3
+ library function to execute commands.
+ '';
+ };
+
+ options.confinement.mode = lib.mkOption {
+ type = types.enum [ "full-apivfs" "chroot-only" ];
+ default = "full-apivfs";
+ description = ''
+ The value full-apivfs (the default) sets up
+ private /dev , /proc , /sys and /tmp file systems in a separate user
+ name space.
+
+ If this is set to chroot-only , only the file
+ system name space is set up along with the call to
+ chroot
+ 2
+ .
+
+ This doesn't cover network namespaces and is solely for
+ file system level isolation. GRANT ''${attrName} ON ''${attrValue}.
+ '';
+ example = literalExample ''
+ {
+ "database.*" = "ALL PRIVILEGES";
+ "*.*" = "SELECT, LOCK TABLES";
+ }
+ '';
+ };
+ };
+ });
default = [];
description = ''
Ensures that the specified users exist and have at least the ensured permissions.
@@ -143,20 +195,22 @@ in
option is changed. This means that users created and permissions assigned once through this option or
otherwise have to be removed manually.
'';
- example = literalExample ''[
- {
- name = "nextcloud";
- ensurePermissions = {
- "nextcloud.*" = "ALL PRIVILEGES";
- };
- }
- {
- name = "backup";
- ensurePermissions = {
- "*.*" = "SELECT, LOCK TABLES";
- };
- }
- ]'';
+ example = literalExample ''
+ [
+ {
+ name = "nextcloud";
+ ensurePermissions = {
+ "nextcloud.*" = "ALL PRIVILEGES";
+ };
+ }
+ {
+ name = "backup";
+ ensurePermissions = {
+ "*.*" = "SELECT, LOCK TABLES";
+ };
+ }
+ ]
+ '';
};
# FIXME: remove this option; it's a really bad idea.
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 5c302752781e..bb658918cb0d 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -8,7 +8,20 @@ let
openldap = pkgs.openldap;
dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
- configFile = pkgs.writeText "slapd.conf" cfg.extraConfig;
+ configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas ''
+ include ${pkgs.openldap.out}/etc/schema/core.schema
+ include ${pkgs.openldap.out}/etc/schema/cosine.schema
+ include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema
+ include ${pkgs.openldap.out}/etc/schema/nis.schema
+ '') + ''
+ ${cfg.extraConfig}
+ database ${cfg.database}
+ suffix ${cfg.suffix}
+ rootdn ${cfg.rootdn}
+ rootpw ${cfg.rootpw}
+ directory ${cfg.dataDir}
+ ${cfg.extraDatabaseConfig}
+ '');
configOpts = if cfg.configDir == null then "-f ${configFile}"
else "-F ${cfg.configDir}";
in
@@ -54,6 +67,52 @@ in
description = "The database directory.";
};
+ defaultSchemas = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Include the default schemas core, cosine, inetorgperson and nis.
+ This setting will be ignored if configDir is set.
+ '';
+ };
+
+ database = mkOption {
+ type = types.str;
+ default = "mdb";
+ description = ''
+ Database type to use for the LDAP.
+ This setting will be ignored if configDir is set.
+ '';
+ };
+
+ suffix = mkOption {
+ type = types.str;
+ example = "dc=example,dc=org";
+ description = ''
+ Specify the DN suffix of queries that will be passed to this backend
+ database.
+ This setting will be ignored if configDir is set.
+ '';
+ };
+
+ rootdn = mkOption {
+ type = types.str;
+ example = "cn=admin,dc=example,dc=org";
+ description = ''
+ Specify the distinguished name that is not subject to access control
+ or administrative limit restrictions for operations on this database.
+ This setting will be ignored if configDir is set.
+ '';
+ };
+
+ rootpw = mkOption {
+ type = types.str;
+ description = ''
+ Password for the root user.
+ This setting will be ignored if configDir is set.
+ '';
+ };
+
logLevel = mkOption {
type = types.str;
default = "0";
@@ -118,6 +177,39 @@ in
# ...
'';
};
+
+ extraDatabaseConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ slapd.conf configuration after the database option.
+ This setting will be ignored if configDir is set.
+ '';
+ example = ''
+ # Indices to maintain for this directory
+ # unique id so equality match only
+ index uid eq
+ # allows general searching on commonname, givenname and email
+ index cn,gn,mail eq,sub
+ # allows multiple variants on surname searching
+ index sn eq,sub
+ # sub above includes subintial,subany,subfinal
+ # optimise department searches
+ index ou eq
+ # if searches will include objectClass uncomment following
+ # index objectClass eq
+ # shows use of default index parameter
+ index default eq,sub
+ # indices missing - uses default eq,sub
+ index telephonenumber
+
+ # other database parameters
+ # read more in slapd.conf reference section
+ cachesize 10000
+ checkpoint 128 15
+ '';
+ };
+
};
};
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index aeab445a9983..87b236dd5fd1 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -238,6 +238,7 @@ in
User = "postgres";
Group = "postgres";
PermissionsStartOnly = true;
+ RuntimeDirectory = "postgresql";
Type = if lib.versionAtLeast cfg.package.version "9.6"
then "notify"
else "simple";
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
index cf26e05d5c18..5ab9add9f32d 100644
--- a/nixos/modules/services/desktops/gsignond.nix
+++ b/nixos/modules/services/desktops/gsignond.nix
@@ -9,6 +9,8 @@ let
in
{
+ meta.maintainers = pkgs.pantheon.maintainers;
+
###### interface
options = {
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix
index bd538db72413..2638a21df733 100644
--- a/nixos/modules/services/desktops/pantheon/contractor.nix
+++ b/nixos/modules/services/desktops/pantheon/contractor.nix
@@ -6,6 +6,8 @@ with lib;
{
+ meta.maintainers = pkgs.pantheon.maintainers;
+
###### interface
options = {
diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix
index 2edbe5b3a6db..577aad6c2987 100644
--- a/nixos/modules/services/desktops/pantheon/files.nix
+++ b/nixos/modules/services/desktops/pantheon/files.nix
@@ -6,6 +6,8 @@ with lib;
{
+ meta.maintainers = pkgs.pantheon.maintainers;
+
###### interface
options = {
diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix
new file mode 100644
index 000000000000..2c6aadadce9d
--- /dev/null
+++ b/nixos/modules/services/mail/mailcatcher.nix
@@ -0,0 +1,60 @@
+{ config, pkgs, lib, ... }:
+
+let
+ cfg = config.services.mailcatcher;
+
+ inherit (lib) mkEnableOption mkIf mkOption types;
+in
+{
+ # interface
+
+ options = {
+
+ services.mailcatcher = {
+ enable = mkEnableOption "Enable MailCatcher.";
+
+ http.ip = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "The ip address of the http server.";
+ };
+
+ http.port = mkOption {
+ type = types.port;
+ default = 1080;
+ description = "The port address of the http server.";
+ };
+
+ smtp.ip = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "The ip address of the smtp server.";
+ };
+
+ smtp.port = mkOption {
+ type = types.port;
+ default = 1025;
+ description = "The port address of the smtp server.";
+ };
+ };
+
+ };
+
+ # implementation
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.mailcatcher ];
+
+ systemd.services.mailcatcher = {
+ description = "MailCatcher Service";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ DynamicUser = true;
+ Restart = "always";
+ ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index f3d90e532c88..c87607d2666a 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -14,9 +14,10 @@ let
log.fields.service = "registry";
storage = {
cache.blobdescriptor = blobCache;
- filesystem.rootdirectory = cfg.storagePath;
delete.enabled = cfg.enableDelete;
- };
+ } // (if cfg.storagePath != null
+ then { filesystem.rootdirectory = cfg.storagePath; }
+ else {});
http = {
addr = "${cfg.listenAddress}:${builtins.toString cfg.port}";
headers.X-Content-Type-Options = ["nosniff"];
@@ -61,9 +62,12 @@ in {
};
storagePath = mkOption {
- type = types.path;
+ type = types.nullOr types.path;
default = "/var/lib/docker-registry";
- description = "Docker registry storage path.";
+ description = ''
+ Docker registry storage path for the filesystem storage backend. Set to
+ null to configure another backend via extraConfig.
+ '';
};
enableDelete = mkOption {
@@ -140,9 +144,12 @@ in {
startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates;
};
- users.users.docker-registry = {
- createHome = true;
- home = cfg.storagePath;
- };
+ users.users.docker-registry =
+ if cfg.storagePath != null
+ then {
+ createHome = true;
+ home = cfg.storagePath;
+ }
+ else {};
};
}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index baa1c855c116..71277b48ecd9 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -160,6 +160,22 @@ let
'';
};
+ gitlab-rails = pkgs.stdenv.mkDerivation rec {
+ name = "gitlab-rails";
+ buildInputs = [ pkgs.makeWrapper ];
+ dontBuild = true;
+ unpackPhase = ":";
+ installPhase = ''
+ mkdir -p $out/bin
+ makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
+ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
+ --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
+ --run 'cd ${cfg.packages.gitlab}/share/gitlab'
+ '';
+ };
+
+ extraGitlabRb = pkgs.writeText "extra-gitlab.rb" cfg.extraGitlabRb;
+
smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" ''
if Rails.env.production?
Rails.application.config.action_mailer.delivery_method = :smtp
@@ -266,6 +282,26 @@ in {
description = "Extra configuration in config/database.yml.";
};
+ extraGitlabRb = mkOption {
+ type = types.str;
+ default = "";
+ example = ''
+ if Rails.env.production?
+ Rails.application.config.action_mailer.delivery_method = :sendmail
+ ActionMailer::Base.delivery_method = :sendmail
+ ActionMailer::Base.sendmail_settings = {
+ location: "/run/wrappers/bin/sendmail",
+ arguments: "-i -t"
+ }
+ end
+ '';
+ description = ''
+ Extra configuration to be placed in config/extra-gitlab.rb. This can
+ be used to add configuration not otherwise exposed through this module's
+ options.
+ '';
+ };
+
host = mkOption {
type = types.str;
default = config.networking.hostName;
@@ -439,7 +475,7 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ];
+ environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
@@ -512,6 +548,7 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [
openssh
+ procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
gitAndTools.git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
@@ -586,6 +623,7 @@ in {
[ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+ ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
${optionalString cfg.smtp.enable ''
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
''}
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index b06c1c4bbc68..fce9b29011f1 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -146,7 +146,7 @@ in
PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
PLEX_MEDIA_SERVER_TMPDIR="/tmp";
PLEX_MEDIA_SERVER_USE_SYSLOG="true";
- LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver";
+ LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver/lib";
LC_ALL="en_US.UTF-8";
LANG="en_US.UTF-8";
};
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index aba64e4f60ff..4ea891262e56 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -261,10 +261,14 @@ let
fi
'';
+ canonicalizePortList =
+ ports: lib.unique (builtins.sort builtins.lessThan ports);
+
commonOptions = {
allowedTCPPorts = mkOption {
- type = types.listOf types.int;
+ type = types.listOf types.port;
default = [ ];
+ apply = canonicalizePortList;
example = [ 22 80 ];
description =
''
@@ -274,7 +278,7 @@ let
};
allowedTCPPortRanges = mkOption {
- type = types.listOf (types.attrsOf types.int);
+ type = types.listOf (types.attrsOf types.port);
default = [ ];
example = [ { from = 8999; to = 9003; } ];
description =
@@ -285,8 +289,9 @@ let
};
allowedUDPPorts = mkOption {
- type = types.listOf types.int;
+ type = types.listOf types.port;
default = [ ];
+ apply = canonicalizePortList;
example = [ 53 ];
description =
''
@@ -295,7 +300,7 @@ let
};
allowedUDPPortRanges = mkOption {
- type = types.listOf (types.attrsOf types.int);
+ type = types.listOf (types.attrsOf types.port);
default = [ ];
example = [ { from = 60000; to = 61000; } ];
description =
diff --git a/nixos/modules/services/networking/quicktun.nix b/nixos/modules/services/networking/quicktun.nix
new file mode 100644
index 000000000000..5bcf923f909c
--- /dev/null
+++ b/nixos/modules/services/networking/quicktun.nix
@@ -0,0 +1,118 @@
+{ config, pkgs, lib, ... }:
+
+let
+
+ cfg = config.services.quicktun;
+
+in
+
+with lib;
+
+{
+ options = {
+
+ services.quicktun = mkOption {
+ default = { };
+ description = "QuickTun tunnels";
+ type = types.attrsOf (types.submodule {
+ options = {
+ tunMode = mkOption {
+ type = types.int;
+ default = 0;
+ example = 1;
+ description = "";
+ };
+
+ remoteAddress = mkOption {
+ type = types.str;
+ example = "tunnel.example.com";
+ description = "";
+ };
+
+ localAddress = mkOption {
+ type = types.str;
+ example = "0.0.0.0";
+ description = "";
+ };
+
+ localPort = mkOption {
+ type = types.int;
+ default = 2998;
+ description = "";
+ };
+
+ remotePort = mkOption {
+ type = types.int;
+ default = 2998;
+ description = "";
+ };
+
+ remoteFloat = mkOption {
+ type = types.int;
+ default = 0;
+ description = "";
+ };
+
+ protocol = mkOption {
+ type = types.str;
+ default = "nacltai";
+ description = "";
+ };
+
+ privateKey = mkOption {
+ type = types.str;
+ description = "";
+ };
+
+ publicKey = mkOption {
+ type = types.str;
+ description = "";
+ };
+
+ timeWindow = mkOption {
+ type = types.int;
+ default = 5;
+ description = "";
+ };
+
+ upScript = mkOption {
+ type = types.lines;
+ default = "";
+ description = "";
+ };
+ };
+ });
+ };
+
+ };
+
+ config = mkIf (cfg != []) {
+ systemd.services = fold (a: b: a // b) {} (
+ mapAttrsToList (name: qtcfg: {
+ "quicktun-${name}" = {
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ environment = {
+ "INTERFACE" = name;
+ "TUN_MODE" = toString qtcfg.tunMode;
+ "REMOTE_ADDRESS" = qtcfg.remoteAddress;
+ "LOCAL_ADDRESS" = qtcfg.localAddress;
+ "LOCAL_PORT" = toString qtcfg.localPort;
+ "REMOTE_PORT" = toString qtcfg.remotePort;
+ "REMOTE_FLOAT" = toString qtcfg.remoteFloat;
+ "PRIVATE_KEY" = qtcfg.privateKey;
+ "PUBLIC_KEY" = qtcfg.publicKey;
+ "TIME_WINDOW" = toString qtcfg.timeWindow;
+ "TUN_UP_SCRIPT" = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript;
+ "SUID" = "nobody";
+ };
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = "${pkgs.quicktun}/bin/quicktun.${qtcfg.protocol}";
+ };
+ };
+ }) cfg
+ );
+ };
+
+}
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 6f6977b38a1d..3bc31832946b 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -64,8 +64,8 @@ in
sendmail. See security.wrappers
If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
- will is allowed to have its own crontab file. The /var/cron/cron.deny file
- is created automatically for you. So every user can use a crontab.
+ is allowed to have its own crontab file. The /var/cron/cron.deny file
+ is created automatically for you, so every user can use a crontab.
Many nixos modules set systemCronJobs, so if you decide to disable vixie cron
and enable another cron daemon, you may want it to get its system crontab
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5ad241ace5c8..eedcccac723c 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -172,7 +172,7 @@ in {
Database host.
Note: for using Unix authentication with PostgreSQL, this should be
- set to /tmp .
+ set to /run/postgresql .
'';
};
dbport = mkOption {
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index 098625aa02f2..dfefa55c5d5e 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -33,7 +33,7 @@
config = {
"none" means that the container's logs will be
+ handled as part of the systemd unit. Setting this to
+ "journald" will result in duplicate logging, but
+ the container's logs will be visible to the docker
+ logs command.
+
+ For more details and a full list of logging drivers, refer to the
+
+ Valid formats:
+
+
+
+
+ <ip>:<hostPort>:<containerPort>
+
+
+
+
+ <ip>::<containerPort>
+
+
+
+
+ <hostPort>:<containerPort>
+
+
+
+
+ <containerPort>
+
+
+
+
+ Both hostPort and
+ containerPort can be specified as a range of
+ ports. When specifying ranges for both, the number of container
+ ports in the range must match the number of host ports in the
+ range. Example: 1234-1236:1234-1236/tcp
+
+
+ When specifying a range for hostPort only, the
+ containerPort must not be a
+ range. In this case, the container port is published somewhere
+ within the specified hostPort range. Example:
+ 1234-1236:1234/tcp
+
+
+ Refer to the
+ "src:dst" strings to
+ allow for src to refer to
+ /nix/store paths, which would difficult with an
+ attribute set. There are also a variety of mount options available
+ as a third field; please refer to the
+ docker run .";
+ example = literalExample ''
+ ["--network=host"]
+ '';
+ };
+ };
+ };
+
+ mkService = name: container: {
+ wantedBy = [ "multi-user.target" ];
+ after = [ "docker.service" "docker.socket" ];
+ requires = [ "docker.service" "docker.socket" ];
+ serviceConfig = {
+ ExecStart = concatStringsSep " \\\n " ([
+ "${pkgs.docker}/bin/docker run"
+ "--rm"
+ "--name=%n"
+ "--log-driver=${container.log-driver}"
+ ] ++ optional (! isNull container.entrypoint)
+ "--entrypoint=${escapeShellArg container.entrypoint}"
+ ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment)
+ ++ map (p: "-p ${escapeShellArg p}") container.ports
+ ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}"
+ ++ map (v: "-v ${escapeShellArg v}") container.volumes
+ ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}"
+ ++ map escapeShellArg container.extraDockerOptions
+ ++ [container.image]
+ ++ map escapeShellArg container.cmd
+ );
+ ExecStartPre = "-${pkgs.docker}/bin/docker rm -f %n";
+ ExecStop = "${pkgs.docker}/bin/docker stop %n";
+ ExecStopPost = "-${pkgs.docker}/bin/docker rm -f %n";
+
+ ### There is no generalized way of supporting `reload` for docker
+ ### containers. Some containers may respond well to SIGHUP sent to their
+ ### init process, but it is not guaranteed; some apps have other reload
+ ### mechanisms, some don't have a reload signal at all, and some docker
+ ### images just have broken signal handling. The best compromise in this
+ ### case is probably to leave ExecReload undefined, so `systemctl reload`
+ ### will at least result in an error instead of potentially undefined
+ ### behaviour.
+ ###
+ ### Advanced users can still override this part of the unit to implement
+ ### a custom reload handler, since the result of all this is a normal
+ ### systemd service from the perspective of the NixOS module system.
+ ###
+ # ExecReload = ...;
+ ###
+
+ TimeoutStartSec = 0;
+ TimeoutStopSec = 120;
+ Restart = "always";
+ };
+ };
+
+in {
+
+ options.docker-containers = mkOption {
+ default = {};
+ type = types.attrsOf (types.submodule dockerContainer);
+ description = "Docker containers to run as systemd services.";
+ };
+
+ config = mkIf (cfg != {}) {
+
+ systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg;
+
+ virtualisation.docker.enable = true;
+
+ };
+
+}
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 037c0d2f0d82..903411799d3e 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -94,6 +94,7 @@ in {
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
+ fsType = "ext4";
};
boot.growPartition = true;
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 6c313f8dd3e4..b9a9515f94ef 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -64,6 +64,7 @@ in rec {
#(all nixos.tests.containers)
(all nixos.tests.containers-imperative)
(all nixos.tests.containers-ipv4)
+ (all nixos.tests.containers-ipv6)
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 4bfb9a423f7d..b5b09dc38d06 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -33,6 +33,7 @@ in rec {
inherit (nixos'.tests)
containers-imperative
containers-ipv4
+ containers-ipv6
firewall
ipv6
login
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 69510c1420fa..d47ebd4a51c7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -59,6 +59,7 @@ in
dhparams = handleTest ./dhparams.nix {};
dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {};
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
+ docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {};
docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {};
docker-registry = handleTest ./docker-registry.nix {};
@@ -113,10 +114,11 @@ in
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
jenkins = handleTest ./jenkins.nix {};
- #kafka = handleTest ./kafka.nix {}; # broken since openjdk: 8u181 -> 8u192
+ kafka = handleTest ./kafka.nix {};
kerberos = handleTest ./kerberos/default.nix {};
kernel-latest = handleTest ./kernel-latest.nix {};
kernel-lts = handleTest ./kernel-lts.nix {};
+ kernel-testing = handleTest ./kernel-testing.nix {};
keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {};
kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};
@@ -130,6 +132,7 @@ in
#lightdm = handleTest ./lightdm.nix {};
login = handleTest ./login.nix {};
#logstash = handleTest ./logstash.nix {};
+ mailcatcher = handleTest ./mailcatcher.nix {};
mathics = handleTest ./mathics.nix {};
matrix-synapse = handleTest ./matrix-synapse.nix {};
memcached = handleTest ./memcached.nix {};
@@ -219,6 +222,7 @@ in
switchTest = handleTest ./switch-test.nix {};
syncthing-relay = handleTest ./syncthing-relay.nix {};
systemd = handleTest ./systemd.nix {};
+ systemd-confinement = handleTest ./systemd-confinement.nix {};
taskserver = handleTest ./taskserver.nix {};
telegraf = handleTest ./telegraf.nix {};
tomcat = handleTest ./tomcat.nix {};
@@ -228,6 +232,7 @@ in
upnp = handleTest ./upnp.nix {};
vault = handleTest ./vault.nix {};
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
+ wireguard = handleTest ./wireguard {};
wordpress = handleTest ./wordpress.nix {};
xautolock = handleTest ./xautolock.nix {};
xdg-desktop-portal = handleTest ./xdg-desktop-portal.nix {};
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 210ad8e91df7..f5c8c4863b6f 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -5,116 +5,109 @@
with import ../lib/testing.nix { inherit system pkgs; };
-let
- # Test ensures buildbot master comes up correctly and workers can connect
- mkBuildbotTest = python: makeTest {
- name = "buildbot";
+# Test ensures buildbot master comes up correctly and workers can connect
+makeTest {
+ name = "buildbot";
- nodes = {
- bbmaster = { pkgs, ... }: {
- services.buildbot-master = {
- enable = true;
- package = python.pkgs.buildbot-full;
+ nodes = {
+ bbmaster = { pkgs, ... }: {
+ services.buildbot-master = {
+ enable = true;
- # NOTE: use fake repo due to no internet in hydra ci
- factorySteps = [
- "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
- "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
- ];
- changeSource = [
- "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
- ];
- };
- networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
- environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ];
- };
-
- bbworker = { pkgs, ... }: {
- services.buildbot-worker = {
- enable = true;
- masterUrl = "bbmaster:9989";
- };
- environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ];
- };
-
- gitrepo = { pkgs, ... }: {
- services.openssh.enable = true;
- networking.firewall.allowedTCPPorts = [ 22 9418 ];
- environment.systemPackages = with pkgs; [ git ];
+ # NOTE: use fake repo due to no internet in hydra ci
+ factorySteps = [
+ "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
+ "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
+ ];
+ changeSource = [
+ "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+ ];
};
+ networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
+ environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ];
};
- testScript = ''
- #Start up and populate fake repo
- $gitrepo->waitForUnit("multi-user.target");
- print($gitrepo->execute(" \
- git config --global user.name 'Nobody Fakeuser' && \
- git config --global user.email 'nobody\@fakerepo.com' && \
- rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
- mkdir -pv /srv/repos/fakerepo ~/.ssh && \
- ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
- cat ~/.ssh/known_hosts && \
- cd /srv/repos/fakerepo && \
- git init && \
- echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
- cat fakerepo.sh && \
- touch .git/git-daemon-export-ok && \
- git add fakerepo.sh .git/git-daemon-export-ok && \
- git commit -m fakerepo && \
- git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
- "));
-
- # Test gitrepo
- $bbmaster->waitForUnit("network-online.target");
- #$bbmaster->execute("nc -z gitrepo 9418");
- print($bbmaster->execute(" \
- rm -rfv /tmp/fakerepo && \
- git clone git://gitrepo/fakerepo /tmp/fakerepo && \
- pwd && \
- ls -la && \
- ls -la /tmp/fakerepo \
- "));
-
- # Test start master and connect worker
- $bbmaster->waitForUnit("buildbot-master.service");
- $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
- $bbworker->waitForUnit("network-online.target");
- $bbworker->execute("nc -z bbmaster 8010");
- $bbworker->execute("nc -z bbmaster 9989");
- $bbworker->waitForUnit("buildbot-worker.service");
- print($bbworker->execute("ls -la /home/bbworker/worker"));
-
-
- # Test stop buildbot master and worker
- print($bbmaster->execute(" \
- systemctl -l --no-pager status buildbot-master && \
- systemctl stop buildbot-master \
- "));
- $bbworker->fail("nc -z bbmaster 8010");
- $bbworker->fail("nc -z bbmaster 9989");
- print($bbworker->execute(" \
- systemctl -l --no-pager status buildbot-worker && \
- systemctl stop buildbot-worker && \
- ls -la /home/bbworker/worker \
- "));
-
-
- # Test buildbot daemon mode
- $bbmaster->execute("buildbot create-master /tmp");
- $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
- $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
- $bbmaster->execute("buildbot start /tmp");
- $bbworker->execute("nc -z bbmaster 8011");
- $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
- $bbmaster->execute("buildbot stop /tmp");
- $bbworker->fail("nc -z bbmaster 8011");
-
- '';
-
- meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
+ bbworker = { pkgs, ... }: {
+ services.buildbot-worker = {
+ enable = true;
+ masterUrl = "bbmaster:9989";
+ };
+ environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ];
+ };
+ gitrepo = { pkgs, ... }: {
+ services.openssh.enable = true;
+ networking.firewall.allowedTCPPorts = [ 22 9418 ];
+ environment.systemPackages = with pkgs; [ git ];
+ };
};
-in {
- python2 = mkBuildbotTest pkgs.python2;
- python3 = mkBuildbotTest pkgs.python3;
+
+ testScript = ''
+ #Start up and populate fake repo
+ $gitrepo->waitForUnit("multi-user.target");
+ print($gitrepo->execute(" \
+ git config --global user.name 'Nobody Fakeuser' && \
+ git config --global user.email 'nobody\@fakerepo.com' && \
+ rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
+ mkdir -pv /srv/repos/fakerepo ~/.ssh && \
+ ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
+ cat ~/.ssh/known_hosts && \
+ cd /srv/repos/fakerepo && \
+ git init && \
+ echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
+ cat fakerepo.sh && \
+ touch .git/git-daemon-export-ok && \
+ git add fakerepo.sh .git/git-daemon-export-ok && \
+ git commit -m fakerepo && \
+ git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
+ "));
+
+ # Test gitrepo
+ $bbmaster->waitForUnit("network-online.target");
+ #$bbmaster->execute("nc -z gitrepo 9418");
+ print($bbmaster->execute(" \
+ rm -rfv /tmp/fakerepo && \
+ git clone git://gitrepo/fakerepo /tmp/fakerepo && \
+ pwd && \
+ ls -la && \
+ ls -la /tmp/fakerepo \
+ "));
+
+ # Test start master and connect worker
+ $bbmaster->waitForUnit("buildbot-master.service");
+ $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
+ $bbworker->waitForUnit("network-online.target");
+ $bbworker->execute("nc -z bbmaster 8010");
+ $bbworker->execute("nc -z bbmaster 9989");
+ $bbworker->waitForUnit("buildbot-worker.service");
+ print($bbworker->execute("ls -la /home/bbworker/worker"));
+
+
+ # Test stop buildbot master and worker
+ print($bbmaster->execute(" \
+ systemctl -l --no-pager status buildbot-master && \
+ systemctl stop buildbot-master \
+ "));
+ $bbworker->fail("nc -z bbmaster 8010");
+ $bbworker->fail("nc -z bbmaster 9989");
+ print($bbworker->execute(" \
+ systemctl -l --no-pager status buildbot-worker && \
+ systemctl stop buildbot-worker && \
+ ls -la /home/bbworker/worker \
+ "));
+
+
+ # Test buildbot daemon mode
+ $bbmaster->execute("buildbot create-master /tmp");
+ $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
+ $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
+ $bbmaster->execute("buildbot start /tmp");
+ $bbworker->execute("nc -z bbmaster 8011");
+ $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
+ $bbmaster->execute("buildbot stop /tmp");
+ $bbworker->fail("nc -z bbmaster 8011");
+
+ '';
+
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
}
diff --git a/nixos/tests/docker-containers.nix b/nixos/tests/docker-containers.nix
new file mode 100644
index 000000000000..972552735202
--- /dev/null
+++ b/nixos/tests/docker-containers.nix
@@ -0,0 +1,29 @@
+# Test Docker containers as systemd units
+
+import ./make-test.nix ({ pkgs, lib, ... }: {
+ name = "docker-containers";
+ meta = {
+ maintainers = with lib.maintainers; [ benley ];
+ };
+
+ nodes = {
+ docker = { pkgs, ... }:
+ {
+ virtualisation.docker.enable = true;
+
+ virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nginx ];
+
+ docker-containers.nginx = {
+ image = "nginx-container";
+ ports = ["8181:80"];
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $docker->waitForUnit("docker-nginx.service");
+ $docker->waitForOpenPort(8181);
+ $docker->waitUntilSucceeds("curl http://localhost:8181|grep Hello");
+ '';
+})
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 399e4d4e428f..502b537ed68b 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -34,8 +34,8 @@ import ./make-test.nix ({ pkgs, ... }: {
# To test the pullImage tool
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
- $docker->succeed("docker run --rm nixos/nix:2.2.1 nix-store --version");
- $docker->succeed("docker rmi nixos/nix:2.2.1");
+ $docker->succeed("docker run --rm nix:2.2.1 nix-store --version");
+ $docker->succeed("docker rmi nix:2.2.1");
# To test runAsRoot and entry point
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 8def0a6f9b9a..6b53914fd859 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -33,11 +33,13 @@ in {
longitude = "0.0";
elevation = 0;
auth_providers = [
- { type = "legacy_api_password"; }
+ {
+ type = "legacy_api_password";
+ api_password = apiPassword;
+ }
];
};
frontend = { };
- http.api_password = apiPassword;
mqtt = { # Use hbmqtt as broker
password = mqttPassword;
};
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 72f91f6428a5..f526d18befee 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -72,4 +72,5 @@ in with pkgs; {
kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1;
kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
+ kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
}
diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix
new file mode 100644
index 000000000000..276d2de12bb5
--- /dev/null
+++ b/nixos/tests/kernel-testing.nix
@@ -0,0 +1,17 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "kernel-testing";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { pkgs, ... }:
+ {
+ boot.kernelPackages = pkgs.linuxPackages_testing;
+ };
+
+ testScript =
+ ''
+ $machine->succeed("uname -s | grep 'Linux'");
+ $machine->succeed("uname -a | grep '${pkgs.linuxPackages_testing.kernel.modDirVersion}'");
+ '';
+})
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index b3fd42e75886..fe859876ed25 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -28,20 +28,19 @@ let
users.ldap.daemon = {
enable = useDaemon;
rootpwmoddn = "cn=admin,${dbSuffix}";
- rootpwmodpw = "/etc/nslcd.rootpwmodpw";
+ rootpwmodpwFile = "/etc/nslcd.rootpwmodpw";
};
- # NOTE: password stored in clear in Nix's store, but this is a test.
- environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd;
users.ldap.loginPam = true;
users.ldap.nsswitch = true;
users.ldap.server = "ldap://server";
users.ldap.base = "ou=posix,${dbSuffix}";
users.ldap.bind = {
distinguishedName = "cn=admin,${dbSuffix}";
- password = "/etc/ldap/bind.password";
+ passwordFile = "/etc/ldap/bind.password";
};
- # NOTE: password stored in clear in Nix's store, but this is a test.
+ # NOTE: passwords stored in clear in Nix's store, but this is a test.
environment.etc."ldap/bind.password".source = pkgs.writeText "password" dbAdminPwd;
+ environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd;
};
in
diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix
new file mode 100644
index 000000000000..d45b5d4edfc5
--- /dev/null
+++ b/nixos/tests/mailcatcher.nix
@@ -0,0 +1,26 @@
+import ./make-test.nix ({ lib, ... }:
+
+{
+ name = "mailcatcher";
+ meta.maintainers = [ lib.maintainers.aanderse ];
+
+ machine =
+ { pkgs, ... }:
+ {
+ services.mailcatcher.enable = true;
+
+ networking.defaultMailServer.directDelivery = true;
+ networking.defaultMailServer.hostName = "localhost:1025";
+
+ environment.systemPackages = [ pkgs.mailutils ];
+ };
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit('mailcatcher.service');
+ $machine->waitForOpenPort('1025');
+ $machine->succeed('echo "this is the body of the email" | mail -s "subject" root@example.org');
+ $machine->succeed('curl http://localhost:1080/messages/1.source') =~ /this is the body of the email/ or die;
+ '';
+})
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 40a599546650..f1218b537711 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -1,4 +1,24 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test.nix ({ pkgs, ...} :
+let
+ accessKey = "BKIKJAA5BMMU2RHO6IBB";
+ secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+ minioPythonScript = pkgs.writeScript "minio-test.py" ''
+ #! ${pkgs.python3.withPackages(ps: [ ps.minio ])}/bin/python
+ import io
+ import os
+ from minio import Minio
+ minioClient = Minio('localhost:9000',
+ access_key='${accessKey}',
+ secret_key='${secretKey}',
+ secure=False)
+ sio = io.BytesIO()
+ sio.write(b'Test from Python')
+ sio.seek(0, os.SEEK_END)
+ sio_len = sio.tell()
+ sio.seek(0)
+ minioClient.put_object('test-bucket', 'test.txt', sio, sio_len, content_type='text/plain')
+ '';
+ in {
name = "minio";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bachp ];
@@ -8,8 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
machine = { pkgs, ... }: {
services.minio = {
enable = true;
- accessKey = "BKIKJAA5BMMU2RHO6IBB";
- secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+ inherit accessKey secretKey;
};
environment.systemPackages = [ pkgs.minio-client ];
@@ -25,9 +44,11 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->waitForOpenPort(9000);
# Create a test bucket on the server
- $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");
+ $machine->succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4");
$machine->succeed("mc mb minio/test-bucket");
+ $machine->succeed("${minioPythonScript}");
$machine->succeed("mc ls minio") =~ /test-bucket/ or die;
+ $machine->succeed("mc cat minio/test-bucket/test.txt") =~ /Test from Python/ or die;
$machine->shutdown;
'';
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 1a6117793664..fedc7f0ab1f0 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
};
nodes = {
- master =
+ mysql =
{ pkgs, ... }:
{
@@ -13,12 +13,34 @@ import ./make-test.nix ({ pkgs, ...} : {
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
services.mysql.package = pkgs.mysql;
};
+
+ mariadb =
+ { pkgs, ... }:
+
+ {
+ users.users.testuser = { };
+ services.mysql.enable = true;
+ services.mysql.ensureDatabases = [ "testdb" ];
+ services.mysql.ensureUsers = [{
+ name = "testuser";
+ ensurePermissions = {
+ "testdb.*" = "ALL PRIVILEGES";
+ };
+ }];
+ services.mysql.package = pkgs.mariadb;
+ };
+
};
testScript = ''
startAll;
- $master->waitForUnit("mysql");
- $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+ $mysql->waitForUnit("mysql");
+ $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+
+ $mariadb->waitForUnit("mysql");
+ $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser");
+ $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser");
+ $mariadb->succeed("echo 'use testdb; select test_id from tests' | sudo -u testuser mysql -u testuser -N | grep 42");
'';
})
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 1eaf87a8eaa8..3ef90e183479 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -4,16 +4,12 @@ import ./make-test.nix {
machine = { pkgs, ... }: {
services.openldap = {
enable = true;
- extraConfig = ''
- include ${pkgs.openldap}/etc/schema/core.schema
- include ${pkgs.openldap}/etc/schema/cosine.schema
- include ${pkgs.openldap}/etc/schema/inetorgperson.schema
- include ${pkgs.openldap}/etc/schema/nis.schema
- database bdb
- suffix dc=example
+ suffix = "dc=example";
+ rootdn = "cn=root,dc=example";
+ rootpw = "notapassword";
+ database = "bdb";
+ extraDatabaseConfig = ''
directory /var/db/openldap
- rootdn cn=root,dc=example
- rootpw notapassword
'';
declarativeContents = ''
dn: dc=example
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 8306abb8c42f..85047f66f23c 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -20,8 +20,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
testScript = ''
print $machine->succeed("ip link");
- $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}");
- $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}");
+ $machine->${if predictable then "fail" else "succeed"}("ip link show eth0 ");
'';
};
}) [[true false] [true false]])
diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix
new file mode 100644
index 000000000000..b7b10fb36aac
--- /dev/null
+++ b/nixos/tests/systemd-confinement.nix
@@ -0,0 +1,168 @@
+import ./make-test.nix {
+ name = "systemd-confinement";
+
+ machine = { pkgs, lib, ... }: let
+ testServer = pkgs.writeScript "testserver.sh" ''
+ #!${pkgs.stdenv.shell}
+ export PATH=${lib.escapeShellArg "${pkgs.coreutils}/bin"}
+ ${lib.escapeShellArg pkgs.stdenv.shell} 2>&1
+ echo "exit-status:$?"
+ '';
+
+ testClient = pkgs.writeScriptBin "chroot-exec" ''
+ #!${pkgs.stdenv.shell} -e
+ output="$(echo "$@" | nc -NU "/run/test$(< /teststep).sock")"
+ ret="$(echo "$output" | sed -nre '$s/^exit-status:([0-9]+)$/\1/p')"
+ echo "$output" | head -n -1
+ exit "''${ret:-1}"
+ '';
+
+ mkTestStep = num: { description, config ? {}, testScript }: {
+ systemd.sockets."test${toString num}" = {
+ description = "Socket for Test Service ${toString num}";
+ wantedBy = [ "sockets.target" ];
+ socketConfig.ListenStream = "/run/test${toString num}.sock";
+ socketConfig.Accept = true;
+ };
+
+ systemd.services."test${toString num}@" = {
+ description = "Confined Test Service ${toString num}";
+ confinement = (config.confinement or {}) // { enable = true; };
+ serviceConfig = (config.serviceConfig or {}) // {
+ ExecStart = testServer;
+ StandardInput = "socket";
+ };
+ } // removeAttrs config [ "confinement" "serviceConfig" ];
+
+ __testSteps = lib.mkOrder num ''
+ subtest '${lib.escape ["\\" "'"] description}', sub {
+ $machine->succeed('echo ${toString num} > /teststep');
+ ${testScript}
+ };
+ '';
+ };
+
+ in {
+ imports = lib.imap1 mkTestStep [
+ { description = "chroot-only confinement";
+ config.confinement.mode = "chroot-only";
+ testScript = ''
+ $machine->succeed(
+ 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix',
+ 'test "$(chroot-exec id -u)" = 0',
+ 'chroot-exec chown 65534 /bin',
+ );
+ '';
+ }
+ { description = "full confinement with APIVFS";
+ testScript = ''
+ $machine->fail(
+ 'chroot-exec ls -l /etc',
+ 'chroot-exec ls -l /run',
+ 'chroot-exec chown 65534 /bin',
+ );
+ $machine->succeed(
+ 'test "$(chroot-exec id -u)" = 0',
+ 'chroot-exec chown 0 /bin',
+ );
+ '';
+ }
+ { description = "check existence of bind-mounted /etc";
+ config.serviceConfig.BindReadOnlyPaths = [ "/etc" ];
+ testScript = ''
+ $machine->succeed('test -n "$(chroot-exec cat /etc/passwd)"');
+ '';
+ }
+ { description = "check if User/Group really runs as non-root";
+ config.serviceConfig.User = "chroot-testuser";
+ config.serviceConfig.Group = "chroot-testgroup";
+ testScript = ''
+ $machine->succeed('chroot-exec ls -l /dev');
+ $machine->succeed('test "$(chroot-exec id -u)" != 0');
+ $machine->fail('chroot-exec touch /bin/test');
+ '';
+ }
+ (let
+ symlink = pkgs.runCommand "symlink" {
+ target = pkgs.writeText "symlink-target" "got me\n";
+ } "ln -s \"$target\" \"$out\"";
+ in {
+ description = "check if symlinks are properly bind-mounted";
+ config.confinement.packages = lib.singleton symlink;
+ testScript = ''
+ $machine->fail('chroot-exec test -e /etc');
+ $machine->succeed('chroot-exec cat ${symlink} >&2');
+ $machine->succeed('test "$(chroot-exec cat ${symlink})" = "got me"');
+ '';
+ })
+ { description = "check if StateDirectory works";
+ config.serviceConfig.User = "chroot-testuser";
+ config.serviceConfig.Group = "chroot-testgroup";
+ config.serviceConfig.StateDirectory = "testme";
+ testScript = ''
+ $machine->succeed('chroot-exec touch /tmp/canary');
+ $machine->succeed('chroot-exec "echo works > /var/lib/testme/foo"');
+ $machine->succeed('test "$(< /var/lib/testme/foo)" = works');
+ $machine->succeed('test ! -e /tmp/canary');
+ '';
+ }
+ { description = "check if /bin/sh works";
+ testScript = ''
+ $machine->succeed(
+ 'chroot-exec test -e /bin/sh',
+ 'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar',
+ );
+ '';
+ }
+ { description = "check if suppressing /bin/sh works";
+ config.confinement.binSh = null;
+ testScript = ''
+ $machine->succeed(
+ 'chroot-exec test ! -e /bin/sh',
+ 'test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo',
+ );
+ '';
+ }
+ { description = "check if we can set /bin/sh to something different";
+ config.confinement.binSh = "${pkgs.hello}/bin/hello";
+ testScript = ''
+ $machine->succeed(
+ 'chroot-exec test -e /bin/sh',
+ 'test "$(chroot-exec /bin/sh -g foo)" = foo',
+ );
+ '';
+ }
+ { description = "check if only Exec* dependencies are included";
+ config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
+ testScript = ''
+ $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek');
+ '';
+ }
+ { description = "check if all unit dependencies are included";
+ config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
+ config.confinement.fullUnit = true;
+ testScript = ''
+ $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek');
+ '';
+ }
+ ];
+
+ options.__testSteps = lib.mkOption {
+ type = lib.types.lines;
+ description = "All of the test steps combined as a single script.";
+ };
+
+ config.environment.systemPackages = lib.singleton testClient;
+
+ config.users.groups.chroot-testgroup = {};
+ config.users.users.chroot-testuser = {
+ description = "Chroot Test User";
+ group = "chroot-testgroup";
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ $machine->waitForUnit('multi-user.target');
+ ${nodes.machine.config.__testSteps}
+ '';
+}
diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix
new file mode 100644
index 000000000000..b0797b963235
--- /dev/null
+++ b/nixos/tests/wireguard/default.nix
@@ -0,0 +1,97 @@
+let
+ wg-snakeoil-keys = import ./snakeoil-keys.nix;
+in
+
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "wireguard";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ma27 ];
+ };
+
+ nodes = {
+ peer0 = { lib, ... }: {
+ boot.kernel.sysctl = {
+ "net.ipv6.conf.all.forwarding" = "1";
+ "net.ipv6.conf.default.forwarding" = "1";
+ "net.ipv4.ip_forward" = "1";
+ };
+
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = lib.singleton {
+ address = "192.168.0.1";
+ prefixLength = 24;
+ };
+ ipv6.addresses = lib.singleton {
+ address = "fd00::1";
+ prefixLength = 64;
+ };
+ };
+
+ networking.firewall.allowedUDPPorts = [ 23542 ];
+ networking.wireguard.interfaces.wg0 = {
+ ips = [ "10.23.42.1/32" "fc00::1/128" ];
+ listenPort = 23542;
+
+ inherit (wg-snakeoil-keys.peer0) privateKey;
+
+ peers = lib.singleton {
+ allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
+
+ inherit (wg-snakeoil-keys.peer1) publicKey;
+ };
+ };
+ };
+
+ peer1 = { pkgs, lib, ... }: {
+ boot.kernel.sysctl = {
+ "net.ipv6.conf.all.forwarding" = "1";
+ "net.ipv6.conf.default.forwarding" = "1";
+ "net.ipv4.ip_forward" = "1";
+ };
+
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = lib.singleton {
+ address = "192.168.0.2";
+ prefixLength = 24;
+ };
+ ipv6.addresses = lib.singleton {
+ address = "fd00::2";
+ prefixLength = 64;
+ };
+ };
+
+ networking.wireguard.interfaces.wg0 = {
+ ips = [ "10.23.42.2/32" "fc00::2/128" ];
+ listenPort = 23542;
+ allowedIPsAsRoutes = false;
+
+ inherit (wg-snakeoil-keys.peer1) privateKey;
+
+ peers = lib.singleton {
+ allowedIPs = [ "0.0.0.0/0" "::/0" ];
+ endpoint = "192.168.0.1:23542";
+ persistentKeepalive = 25;
+
+ inherit (wg-snakeoil-keys.peer0) publicKey;
+ };
+
+ postSetup = let inherit (pkgs) iproute; in ''
+ ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0
+ ${iproute}/bin/ip route replace fc00::1/128 dev wg0
+ '';
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $peer0->waitForUnit("wireguard-wg0.service");
+ $peer1->waitForUnit("wireguard-wg0.service");
+
+ $peer1->succeed("ping -c5 fc00::1");
+ $peer1->succeed("ping -c5 10.23.42.1")
+ '';
+})
diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixos/tests/wireguard/snakeoil-keys.nix
new file mode 100644
index 000000000000..55ad582d4059
--- /dev/null
+++ b/nixos/tests/wireguard/snakeoil-keys.nix
@@ -0,0 +1,11 @@
+{
+ peer0 = {
+ privateKey = "OPuVRS2T0/AtHDp3PXkNuLQYDiqJaBEEnYe42BSnJnQ=";
+ publicKey = "IujkG119YPr2cVQzJkSLYCdjpHIDjvr/qH1w1tdKswY=";
+ };
+
+ peer1 = {
+ privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg=";
+ publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=";
+ };
+}
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 331ef6b92a4f..f597d6b6527c 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -2,8 +2,8 @@
, makeWrapper, makeDesktopItem
, qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative
-, qtlocation, qtquickcontrols2, qtwebchannel
-, qtwebengine, qtx11extras, qtxmlpatterns
+, qtlocation, qtquickcontrols, qtquickcontrols2
+, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
, hidapi
@@ -11,22 +11,35 @@
with stdenv.lib;
+let
+ qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
+
+ qml2ImportPath = concatMapStringsSep ":" qmlPath [
+ qtbase.bin qtmultimedia.bin qtgraphicaleffects
+ qtdeclarative.bin qtlocation.bin
+ qtquickcontrols qtquickcontrols2.bin
+ qtwebchannel.bin qtwebengine.bin qtxmlpatterns
+ ];
+
+in
+
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
- version = "0.13.0.4";
+ version = "0.14.0.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw";
+ sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8";
};
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [
qtbase qtmultimedia qtgraphicaleffects
- qtdeclarative qtlocation qtquickcontrols2
+ qtdeclarative qtlocation
+ qtquickcontrols qtquickcontrols2
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
@@ -81,6 +94,11 @@ stdenv.mkDerivation rec {
cp $src/images/appicons/$size.png \
$out/share/icons/hicolor/$size/apps/monero.png
done;
+
+ # wrap runtime dependencies
+ wrapProgram $out/bin/monero-wallet-gui \
+ --set QML2_IMPORT_PATH "${qml2ImportPath}" \
+ --set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}"
'';
meta = {
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
index 74f817d81350..ae733151622d 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -13,15 +13,17 @@ index 79223c0..e80b317 100644
parser.addHelpOption();
parser.process(app);
diff --git a/Logger.cpp b/Logger.cpp
-index 660bafc..dae24d4 100644
+index 6b1daba..c357762 100644
--- a/Logger.cpp
+++ b/Logger.cpp
-@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
- #elif defined(Q_OS_MAC)
- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
+@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log";
+ static const QString appFolder = "Library/Logs";
#else // linux + bsd
+ //HomeLocation = "~"
- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
+- static const QString appFolder = ".bitmonero";
+ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
++ static const QString appFolder = "bitmonero";
#endif
-
+
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 3a962458632e..94c277f63eb0 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-${version}";
- version = "0.13.0.4";
+ version = "0.14.0.2";
src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
- sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d";
+ sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k";
};
nativeBuildInputs = [ cmake pkgconfig git ];
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index b3a0c6377214..1b0dfebe22c2 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
-, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
+, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
@@ -49,7 +49,6 @@ let
protobuf
qca2
qjson
- qt4
sqlite
taglib
]
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
index f82ec7a4ea13..df0fcb0ee9cd 100644
--- a/pkgs/applications/audio/csound/csound-manual/default.nix
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -1,18 +1,19 @@
-{
- stdenv, fetchurl, docbook_xsl,
- docbook_xml_dtd_45, python, pygments,
- libxslt
+{
+ stdenv, fetchFromGitHub, docbook_xsl,
+ docbook_xml_dtd_45, python, pygments,
+ libxslt
}:
stdenv.mkDerivation rec {
- version = "6.12.0";
- name = "csound-manual-${version}";
-
- src = fetchurl {
- url = "https://github.com/csound/manual/archive/${version}.tar.gz";
- sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp";
- };
+ pname = "csound-manual";
+ version = "unstable-2019-02-22";
+ src = fetchFromGitHub {
+ owner = "csound";
+ repo = "manual";
+ rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f";
+ sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn";
+ };
prePatch = ''
substituteInPlace manual.xml \
@@ -41,4 +42,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
}
-
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 6c4818f869ff..3b850a27327b 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "1.0";
+ version = "1.0.3";
format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "00hjxpgmhzhyjjdpm92cbbxwnc17xdhhk8svk5ih3n18yk5655fs";
+ sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 9687ff3106bd..b3efa82ead47 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
name = "muse-sequencer-${version}";
- version = "3.0.2";
+ version = "3.1pre1";
meta = with stdenv.lib; {
homepage = http://www.muse-sequencer.org;
@@ -38,11 +38,16 @@ stdenv.mkDerivation rec {
fetchFromGitHub {
owner = "muse-sequencer";
repo = "muse";
- rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d";
- sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51";
+ rev = "2167ae053c16a633d8377acdb1debaac10932838";
+ sha256 = "0rsdx8lvcbz5bapnjvypw8h8bq587s9z8cf2znqrk6ah38s6fsrf";
};
+ nativeBuildInputs = [
+ pkgconfig
+ gitAndTools.gitFull
+ ];
+
buildInputs = [
libjack2
qt5.qtsvg
@@ -57,8 +62,6 @@ stdenv.mkDerivation rec {
lash
dssi
liblo
- pkgconfig
- gitAndTools.gitFull
];
sourceRoot = "source/muse3";
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 8ec4a342522d..9407a1c26882 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "musescore-${version}";
- version = "3.0.1";
+ version = "3.0.5";
src = fetchzip {
url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip";
- sha256 = "1l9djxq5hdfqiya2jwcag7qq4dhmb9qcv68y27dlza19imrnim80";
+ sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8";
stripRoot = false;
};
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 084487fd407a..5957a740f350 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "padthv1-${version}";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
- sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y";
+ sha256 = "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 23ba3582ce61..6ad931d4867a 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "paprefs-1.0";
+ name = "paprefs-1.1";
src = fetchurl {
url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
- sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md";
+ sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf";
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix
index 3310bfdf3f03..87257f4920df 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/pkgs/applications/audio/parlatype/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "parlatype";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.gtk
+ gtk3
at-spi2-core
dbus
gst_all_1.gstreamer
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix
new file mode 100644
index 000000000000..b2c049c9eeeb
--- /dev/null
+++ b/pkgs/applications/audio/paulstretch/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat,
+minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }:
+
+stdenv.mkDerivation {
+ pname = "paulstretch";
+ version = "2.2-2";
+
+ src = fetchFromGitHub {
+ owner = "paulnasca";
+ repo = "paulstretch_cpp";
+ rev = "7f5c3993abe420661ea0b808304b0e2b4b0048c5";
+ sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [
+ audiofile
+ libvorbis
+ fltk
+ fftw
+ fftwFloat
+ minixml
+ libmad
+ libjack2
+ portaudio
+ libsamplerate
+ ];
+
+ buildPhase = ''
+ bash compile_linux_fftw_jack.sh
+ '';
+
+ installPhase = ''
+ install -Dm555 ./paulstretch $out/bin/paulstretch
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Produces high quality extreme sound stretching";
+ longDescription = ''
+ This is a program for stretching the audio. It is suitable only for
+ extreme sound stretching of the audio (like 50x) and for applying
+ special effects by "spectral smoothing" the sounds.
+ It can transform any sound/music to a texture.
+ '';
+ homepage = http://hypermammut.sourceforge.net/paulstretch/;
+ platforms = platforms.linux;
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index c10358eed1e4..eab498b96249 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-1.2.5";
+ name = "qmmp-1.3.1";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx";
+ sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw";
};
buildInputs =
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index cabebb6f18e9..8e2b096672c1 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper
, alsaLib, xorg
-, gnome3, pango, gdk_pixbuf, cairo, glib, freetype
+, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
, libpulseaudio, xdg_utils
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- gnome3.gtk
+ gtk3
];
dontBuild = true;
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index eab50c904795..2162ddd79815 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -4,6 +4,7 @@
, perlPackages
, gtk3
, intltool
+, libpeas
, libsoup
, gnome3
, totem-pl-parser
@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
json-glib
gtk3
- gnome3.libpeas
+ libpeas
totem-pl-parser
gnome3.adwaita-icon-theme
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 73f24e03e307..cba85aacfbb8 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld";
+ sha256 = "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index e44df51404a4..0918cf42830b 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv";
+ sha256 = "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 24c033001cb6..63bb966e3887 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
- version = "1.5.10.1";
+ version = "1.5.10.2";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
- sha256 = "02mmy17sa3dlwmjjahn8rfd6h67c5s0q3fvkf6ljrc2mbbpwc375";
+ sha256 = "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01";
};
buildInputs = [
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 7876ebc244b1..4f8e520cb9f2 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
, gnome3, libnotify, itstool, glib, gtk3, libxml2
-, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
+, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
, appstream-glib, desktop-file-utils, duplicity
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- libnotify gnome3.libpeas glib gtk3 libsecret
+ libnotify libpeas glib gtk3 libsecret
pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror
];
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index a1465766f8bf..5eb2d54d755d 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -39,11 +39,12 @@
let
drvName = "android-studio-${channel}-${version}";
+ archiveFormat = if builtins.elem channel [ "dev" "canary" ] then "tar.gz" else "zip";
androidStudio = stdenv.mkDerivation {
name = drvName;
src = fetchurl {
- url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+ url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.${archiveFormat}";
sha256 = sha256Hash;
};
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index f3e5602a7996..ebce09d52ce5 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,14 +13,14 @@ let
sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2";
};
betaVersion = {
- version = "3.4.0.16"; # "Android Studio 3.4 RC 2"
- build = "183.5370308";
- sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9";
+ version = "3.4.0.17"; # "Android Studio 3.4 RC 3"
+ build = "183.5400832";
+ sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1";
};
latestVersion = { # canary & dev
- version = "3.5.0.6"; # "Android Studio 3.5 Canary 7"
- build = "183.5346365";
- sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0";
+ version = "3.5.0.8"; # "Android Studio 3.5 Canary 9"
+ build = "191.5409101";
+ sha256Hash = "06fc5l40nxm0hyn8c34wsckxxyh1i2q5a53zd4nbhwxi8wsrda7i";
};
in rec {
# Old alias (TODO @primeos: Remove after 19.03 is branched off):
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 2f7a4233656c..fe77ffe84bb1 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor
-, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
+{ stdenv, lib, fetchpatch, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm
+, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf
, systemd ? null
@@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
patches = [
./clean-env.patch
./tramp-detect-wrapped-gvfsd.patch
+
+ # should drop this at next package update
+ (fetchpatch {
+ name = "support-hunspell-1.7.0-in-ispell.el.patch";
+ url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584";
+ sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11";
+ })
];
postPatch = lib.optionalString srcRepo ''
@@ -123,7 +130,7 @@ stdenv.mkDerivation rec {
let libPath = lib.makeLibraryPath [
libXcursor
];
- in lib.optionalString (withX && toolkit == "lucid") ''
+ in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
patchelf --set-rpath \
"$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \
"$out/bin/emacs"
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 99b014adb023..38606bc4c296 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -17,6 +17,7 @@
, json-glib
, jsonrpc-glib
, libdazzle
+, libpeas
, libxml2
, meson
, ninja
@@ -64,7 +65,7 @@ in stdenv.mkDerivation {
flatpak
gnome3.devhelp
libgit2-glib
- gnome3.libpeas
+ libpeas
vte
gspell
gtk3
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index c3d24b9776f6..584c12d5ff63 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2018.3.4"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */
+ sha256 = "1rlqnnv6b7lg18si31zd97ixnslwp8j6imkkjq0j5n9sydsr8xzj"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -263,12 +263,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2018.3.2"; /* updated by script */
+ version = "2018.3.4"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */
+ sha256 = "10sw41kkf2k60xjpwgc73i182y7px3dmqz2awnrl4gffdb9jgzmy"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -276,12 +276,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2018.3.3"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */
+ sha256 = "0aq3x5aixh86h1zvvwrbr2f1nnqdpfvlsadd2ckmf5s5kghvg5r9"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -289,12 +289,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2018.3.4"; /* updated by script */
+ version = "2019.1"; /* 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 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */
+ sha256 = "0zyw88dd2v4igp080l99cyq6h0bmyri8a50fjp69ripiz9qaawx1"; /* 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.3.4"; /* updated by script */
+ version = "2019.1"; /* 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 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */
+ url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
+ sha256 = "0fsdf090cwwrsq3azknc9rpwwsl71cvsx4flivnqwfakb6rh4f1j"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -315,12 +315,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2018.3.3"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */
+ sha256 = "1bv2a16wsc9j82w14qfrfjgszwkihk0jwp8bp8z9618q04c8vmgf"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -328,12 +328,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2018.3.4"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */
+ sha256 = "173qm2g6pjga2jlw8sa59bxw543b56r56ikqwv2wp0jq5z61v26f"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -341,12 +341,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2018.3.4"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */
+ sha256 = "0gjphdzdxgvflkzaakf3c1wnig86lxhxyx6xk6rg40yj6f2hzi47"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -354,12 +354,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2018.3.2"; /* updated by script */
+ version = "2018.3.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */
+ sha256 = "1klmg8wgj3shp4s0n2nn7n39zsk1mch6g9ifhwn5cgywpbzgam4p"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -367,12 +367,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2018.3.3"; /* updated by script */
+ version = "2018.3.5"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */
+ sha256 = "1gykag8fsfqxv0d6fipn18hhpdvn4qxva2kkb0v330vp73wm2i2w"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -380,12 +380,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2018.3.4"; /* updated by script */
+ version = "2019.1"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */
+ sha256 = "0r6a9g8ydnxf805gn2wajnwkcyfn0xksbsrs8wq6j4ghipkhscxj"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 08918beb8d59..9547b82efa1f 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, gnome3, at-spi2-core,
+{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
- libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
+ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
dbus
openssl
libxml2
- gnome3.gtksourceview
+ gtksourceview3
at-spi2-core
pcre
epoxy
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
aspell
libgit2
libxkbcommon
- gnome3.gtkmm3
+ gtkmm3
libpthreadstubs
- gnome3.gtksourceviewmm
+ gtksourceviewmm
llvmPackages.clang.cc
llvmPackages.lldb
gnome3.dconf
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 532bb99e7d8e..1d9908a7cc00 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,14 +2,14 @@
let
pname = "kdev-php";
- version = "5.3.1";
+ version = "5.3.2";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl";
+ sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index be27e10f42a1..eda2da9f3daa 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,14 +2,14 @@
let
pname = "kdev-python";
- version = "5.3.1";
+ version = "5.3.2";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j";
+ sha256 = "0gqv1abzfpxkrf538rb62d2291lmlra8rghm9q9r3x8a46wh96zm";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 98154b4a5eb5..23ec887ad621 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -9,7 +9,7 @@
let
pname = "kdevelop";
- version = "5.3.1";
+ version = "5.3.2";
qtVersion = "5.${lib.versions.minor qtbase.version}";
in
mkDerivation rec {
@@ -17,7 +17,7 @@ mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr";
+ sha256 = "0akgdnvrab6mbwnmvgzsplk0qh83k1hnm5xc06yxr1s1a5sxbk08";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index cda45c2c739d..891fd32df70b 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.buildPythonApplication rec {
pname = "neovim-remote";
- version = "2.1.4";
+ version = "2.1.5";
disabled = !pythonPackages.isPy3k;
src = fetchFromGitHub {
owner = "mhinz";
repo = "neovim-remote";
rev = "v${version}";
- sha256 = "1s438cbyyzgg96b6639wk1ny6d6p2ywcba41l3r027wzyl7wrn8v";
+ sha256 = "1h05b68ka1ka217f6svq8yxvnscwf9sl5cx46c0b6ygcbz1vr3ba";
};
propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
new file mode 100644
index 000000000000..3288b8e90adc
--- /dev/null
+++ b/pkgs/applications/editors/retext/default.nix
@@ -0,0 +1,63 @@
+{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts
+# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
+# available.
+, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]
+}:
+
+let
+ version = "7.0.4";
+ python = let
+ packageOverrides = self: super: {
+ markdown = super.markdown.overridePythonAttrs(old: rec {
+ src = super.fetchPypi {
+ version = "3.0.1";
+ pname = "Markdown";
+ sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c";
+ };
+ });
+
+ chardet = super.chardet.overridePythonAttrs(old: rec {
+ src = super.fetchPypi {
+ version = "2.3.0";
+ pname = "chardet";
+ sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa";
+ };
+ });
+ };
+ in python3.override { inherit packageOverrides; };
+ pythonEnv = python.withPackages (ps: with ps; [
+ pyqt5 docutils pyenchant Markups markdown pygments chardet
+ ]);
+in python.pkgs.buildPythonApplication {
+ inherit version;
+ pname = "retext";
+
+ src = fetchFromGitHub {
+ owner = "retext-project";
+ repo = "retext";
+ rev = "${version}";
+ sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si";
+ };
+
+ doCheck = false;
+
+ nativeBuildInputs = [ makeWrapper ];
+ propagatedBuildInputs = [ pythonEnv ];
+
+ postInstall = ''
+ mv $out/bin/retext $out/bin/.retext
+ makeWrapper "$out/bin/.retext" "$out/bin/retext" \
+ --set ASPELL_CONF "dict-dir ${buildEnv {
+ name = "aspell-all-dicts";
+ paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
+ }}"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/retext-project/retext/;
+ description = "Simple but powerful editor for Markdown and reStructuredText";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ klntsky ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index 8f304524dffa..8b94b87e0505 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -1,6 +1,6 @@
{buildVersion, x32sha256, x64sha256, dev ? false}:
-{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell,
+{ fetchurl, stdenv, glib, glibcLocales, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell,
pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
gksuSupport ? false, gksu, unzip, zip, bash,
writeScript, common-updater-scripts, curl, gnugrep}:
@@ -99,6 +99,7 @@ in let
wrapProgram $out/sublime_text \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
+ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''}
# Without this, plugin_host crashes, even though it has the rpath
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index eab51463f16f..9d7539b5b651 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,10 +5,10 @@ let
in
rec {
sublime3-dev = common {
- buildVersion = "3184";
+ buildVersion = "3203";
dev = true;
- x32sha256 = "1b6f1fid75g5z247dbnyyj276lrlv99scrdk1vvfcr6vyws77vzr";
- x64sha256 = "03127jhfjr17ai96p3axh5b5940fds8jcw6vkid8y6dmvd2dpylz";
+ x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx";
+ x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d";
} {};
sublime3 = common {
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index ebd7c77f678c..deb4974a9b14 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,32 +1,44 @@
-{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gnome3, wrapGAppsHook }:
+{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "typora";
- version = "0.9.64";
+ version = "0.9.68";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "0dffydc11ys2i38gdy8080ph1xlbbzhcdcc06hyfv0dr0nf58a09";
+ sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp";
};
- nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
+ nativeBuildInputs = [
+ dpkg
+ makeWrapper
+ wrapGAppsHook
+ ];
- buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ];
+ buildInputs = [
+ glib
+ gsettings-desktop-schemas
+ gtk3
+ ];
unpackPhase = "dpkg-deb -x $src .";
dontWrapGApps = true;
installPhase = ''
- mkdir -p $out/bin $out/share/typora
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share
{
cd usr
- mv share/typora/resources/app/* $out/share/typora
- mv share/applications $out/share
- mv share/icons $out/share
- mv share/doc $out/share
+ mv share/typora/resources/app $out/share/typora
+ mv share/{applications,icons,doc} $out/share/
}
+ runHook postInstall
+ '';
+
+ postFixup = ''
makeWrapper ${electron_3}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
@@ -37,7 +49,7 @@ stdenv.mkDerivation rec {
description = "A minimal Markdown reading & writing app";
homepage = https://typora.io;
license = licenses.unfree;
- maintainers = with maintainers; [ jensbin ];
+ maintainers = with maintainers; [ jensbin worldofpeace ];
inherit (electron_3.meta) platforms;
};
}
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index f8753ecd1eb8..efbf5864faa8 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
- broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118
maintainers = with maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index bc8f2c608693..f322c6442b84 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -17,10 +17,10 @@
stdenv.mkDerivation rec {
name = "drawpile-${version}";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchurl {
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
- sha256 = "0fngj5hfinj66xpij2h3ag79mgmqcfrjpwynxdbjr5brch25ldwj";
+ sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn";
};
nativeBuildInputs = [
extra-cmake-modules
diff --git a/pkgs/applications/graphics/image_optim/Gemfile b/pkgs/applications/graphics/image_optim/Gemfile
new file mode 100644
index 000000000000..d6a0f13a4c1a
--- /dev/null
+++ b/pkgs/applications/graphics/image_optim/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'image_optim'
diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock
new file mode 100644
index 000000000000..20c9772ce464
--- /dev/null
+++ b/pkgs/applications/graphics/image_optim/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ exifr (1.3.6)
+ fspath (3.1.0)
+ image_optim (0.26.3)
+ exifr (~> 1.2, >= 1.2.2)
+ fspath (~> 3.0)
+ image_size (>= 1.5, < 3)
+ in_threads (~> 1.3)
+ progress (~> 3.0, >= 3.0.1)
+ image_size (2.0.0)
+ in_threads (1.5.1)
+ progress (3.5.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ image_optim
+
+BUNDLED WITH
+ 1.16.3
diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix
new file mode 100644
index 000000000000..d7f05381c62e
--- /dev/null
+++ b/pkgs/applications/graphics/image_optim/default.nix
@@ -0,0 +1,66 @@
+{ lib, bundlerApp, fetchurl, ruby, makeWrapper,
+ withPngcrush ? true, pngcrush ? null,
+ withPngout ? true, pngout ? null,
+ withAdvpng ? true, advancecomp ? null,
+ withOptipng ? true, optipng ? null,
+ withPngquant ? true, pngquant ? null,
+ withJhead ? true, jhead ? null,
+ withJpegoptim ? true, jpegoptim ? null,
+ withJpegrecompress ? true, jpeg-archive ? null,
+ withJpegtran ? true, libjpeg ? null,
+ withGifsicle ? true, gifsicle ? null,
+ withSvgo ? true, svgo ? null
+}:
+
+assert withPngcrush -> pngcrush != null;
+assert withPngout -> pngout != null;
+assert withAdvpng -> advancecomp != null;
+assert withOptipng -> optipng != null;
+assert withPngquant -> pngquant != null;
+assert withJhead -> jhead != null;
+assert withJpegoptim -> jpegoptim != null;
+assert withJpegrecompress -> jpeg-archive != null;
+assert withJpegtran -> libjpeg != null;
+assert withGifsicle -> gifsicle != null;
+assert withSvgo -> svgo != null;
+
+with lib;
+
+let
+ optionalDepsPath = []
+ ++ optional withPngcrush pngcrush
+ ++ optional withPngout pngout
+ ++ optional withAdvpng advancecomp
+ ++ optional withOptipng optipng
+ ++ optional withPngquant pngquant
+ ++ optional withJhead jhead
+ ++ optional withJpegoptim jpegoptim
+ ++ optional withJpegrecompress jpeg-archive
+ ++ optional withJpegtran libjpeg
+ ++ optional withGifsicle gifsicle
+ ++ optional withSvgo svgo;
+in
+
+bundlerApp {
+ pname = "image_optim";
+ gemdir = ./.;
+
+ inherit ruby;
+
+ exes = [ "image_optim" ];
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/image_optim \
+ --prefix PATH : ${makeBinPath optionalDepsPath}
+ '';
+
+ meta = with lib; {
+ description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)";
+ homepage = http://github.com/toy/image_optim;
+ license = licenses.mit;
+ maintainers = with maintainers; [ srghma ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix
new file mode 100644
index 000000000000..6c9ec2de7457
--- /dev/null
+++ b/pkgs/applications/graphics/image_optim/gemset.nix
@@ -0,0 +1,51 @@
+{
+ exifr = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0q2abhiyvgfv23i0izbskjxcqaxiw9bfg6s57qgn4li4yxqpwpfg";
+ type = "gem";
+ };
+ version = "1.3.6";
+ };
+ fspath = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vjn9sy4hklr2d5wxmj5x1ry31dfq3sjp779wyprb3nbbdmra1sc";
+ type = "gem";
+ };
+ version = "3.1.0";
+ };
+ image_optim = {
+ dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "082w9qcyy9j6m6s2pknfdcik7l2qch4j48axs13m06l4s1hz0dmg";
+ type = "gem";
+ };
+ version = "0.26.3";
+ };
+ image_size = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bcn7nc6qix3w4sf7xd557lnsgjniqa7qvz7nnznx70m8qfbc7ig";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ in_threads = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14hqm59sgqi91ag187zwpgwi58xckjkk58m031ghkp0csl8l9mkx";
+ type = "gem";
+ };
+ version = "1.5.1";
+ };
+ progress = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yrzq4v5sp7cg4nbgqh11k3d1czcllfz98dcdrxrsjxwq5ziiw0p";
+ type = "gem";
+ };
+ version = "3.5.0";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/graphics/image_optim/update.sh b/pkgs/applications/graphics/image_optim/update.sh
new file mode 100755
index 000000000000..8afd7f90436d
--- /dev/null
+++ b/pkgs/applications/graphics/image_optim/update.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundix bundler
+
+SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")")
+
+cd $SCRIPT_DIR
+
+bundle lock --update
+bundix
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
new file mode 100644
index 000000000000..8002da557035
--- /dev/null
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
+
+stdenv.mkDerivation rec {
+ name = "jpeg-archive-${version}";
+ version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15
+
+ # update with
+ # nix-prefetch-git https://github.com/danielgtaylor/jpeg-archive
+ src = fetchFromGitHub {
+ owner = "danielgtaylor";
+ repo = "jpeg-archive";
+ rev = "8da4bf76b6c3c0e11e4941294bfc1857c119419b";
+ sha256 = "1639y9qp2ls80fzimwmwds792q8rq5p6c14c0r4jswx4yp6dcs33";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ mozjpeg ];
+
+ prePatch = ''
+ # allow override LIBJPEG
+ substituteInPlace Makefile --replace 'LIBJPEG =' 'LIBJPEG ?='
+ '';
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "MOZJPEG_PREFIX=${mozjpeg}"
+ "LIBJPEG=${mozjpeg}/lib/libjpeg.so"
+ ];
+
+ postInstall = ''
+ wrapProgram $out/bin/jpeg-archive \
+ --set PATH "$out/bin:${coreutils}/bin:${parallel}/bin:${findutils}/bin"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Utilities for archiving photos for saving to long term storage or serving over the web";
+ homepage = "https://github.com/danielgtaylor/jpeg-archive";
+ # license = ...; # mixed?
+ maintainers = [ maintainers.srghma ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index c9fdbd255d46..507cee548e09 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -5,27 +5,27 @@
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, openjpeg, opencolorio, vc, poppler, curl, ilmbase
, qtmultimedia, qtx11extras
-, python3
+, python3Packages
}:
let
major = "4.1";
-minor = "7";
-patch = "101";
+minor = "8";
+patch = null;
in
mkDerivation rec {
name = "krita-${version}";
- version = "${major}.${minor}.${patch}";
+ version = "${major}.${minor}";
src = fetchurl {
url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz";
- sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav";
+ sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4";
};
- nativeBuildInputs = [ cmake extra-cmake-modules ];
+ nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@@ -33,11 +33,17 @@ mkDerivation rec {
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
openjpeg opencolorio poppler curl ilmbase
qtmultimedia qtx11extras
- python3
+ python3Packages.pyqt5
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
+ cmakeFlags = [
+ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
+ "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/share/sip/PyQt5"
+ "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+ ];
+
meta = with lib; {
description = "A free and open source painting application";
homepage = https://krita.org/;
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 4b3a423a8ce2..25abcd9d41d7 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# lrelease command:
LRELEASECOMMAND = lrelease
# qcollectiongenerator command:
- #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
+ QCOLLECTIONGENERATORCOMMAND = qhelpgenerator
# TikZ documentation default file path:
TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 3990d0989062..89828ff45d7c 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtx11extras, qtsvg, makeWrapper
, vulkan-loader, xorg
-, python36, bison, pcre, automake, autoconf
+, python3, bison, pcre, automake, autoconf
}:
let
custom_swig = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36
+ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
];
nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ];
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 9fa3c8a14141..fcbbbbb72eb3 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -31,10 +31,10 @@ index be1cc4afb..6d0c1d7e5 100644
}
return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 8b057b459..3fa4548ad 100644
+index dfff6fc29..419e54a5b 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@@ -42,7 +42,7 @@ index 8b057b459..3fa4548ad 100644
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
-@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings)
#endif
const bool defaultInternalServer = true;
@@ -51,38 +51,29 @@ index 8b057b459..3fa4548ad 100644
- defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
- }
-#endif
-- const QStringList mysqldSearchPath = QStringList()
-- << QStringLiteral("/usr/bin")
-- << QStringLiteral("/usr/sbin")
-- << QStringLiteral("/usr/local/sbin")
-- << QStringLiteral("/usr/local/libexec")
-- << QStringLiteral("/usr/libexec")
-- << QStringLiteral("/opt/mysql/libexec")
-- << QStringLiteral("/opt/local/lib/mysql5/bin")
-- << QStringLiteral("/opt/mysql/sbin");
- if (defaultServerPath.isEmpty()) {
-- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath);
+- defaultServerPath = findExecutable(QStringLiteral("mysqld"));
- }
-
-- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath);
+- const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin"));
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings)
#endif
}
-- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath);
+- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db"));
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
-- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath);
+- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck"));
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -91,7 +82,7 @@ index 8b057b459..3fa4548ad 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
-@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi");
}
@@ -101,7 +92,7 @@ index 8b057b459..3fa4548ad 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
-@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -111,7 +102,7 @@ index 8b057b459..3fa4548ad 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
-@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer()
#endif
// generate config file
@@ -189,3 +180,6 @@ index 6b50ae50e..f94a8c5eb 100644
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
+--
+2.18.1
+
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 6f6acd1e8bb8..e06c7f0d14aa 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.12.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 1efdd3e61235..416273d719fe 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1723 +3,1723 @@
{
akonadi = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz";
- sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx";
- name = "akonadi-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz";
+ sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658";
+ name = "akonadi-18.12.3.tar.xz";
};
};
akonadi-calendar = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz";
- sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri";
- name = "akonadi-calendar-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz";
+ sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee";
+ name = "akonadi-calendar-18.12.3.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz";
- sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl";
- name = "akonadi-calendar-tools-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz";
+ sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed";
+ name = "akonadi-calendar-tools-18.12.3.tar.xz";
};
};
akonadiconsole = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz";
- sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk";
- name = "akonadiconsole-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz";
+ sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0";
+ name = "akonadiconsole-18.12.3.tar.xz";
};
};
akonadi-contacts = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz";
- sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq";
- name = "akonadi-contacts-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz";
+ sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc";
+ name = "akonadi-contacts-18.12.3.tar.xz";
};
};
akonadi-import-wizard = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz";
- sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j";
- name = "akonadi-import-wizard-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz";
+ sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104";
+ name = "akonadi-import-wizard-18.12.3.tar.xz";
};
};
akonadi-mime = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz";
- sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk";
- name = "akonadi-mime-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz";
+ sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4";
+ name = "akonadi-mime-18.12.3.tar.xz";
};
};
akonadi-notes = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz";
- sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4";
- name = "akonadi-notes-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz";
+ sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60";
+ name = "akonadi-notes-18.12.3.tar.xz";
};
};
akonadi-search = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz";
- sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6";
- name = "akonadi-search-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz";
+ sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346";
+ name = "akonadi-search-18.12.3.tar.xz";
};
};
akregator = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz";
- sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9";
- name = "akregator-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz";
+ sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1";
+ name = "akregator-18.12.3.tar.xz";
};
};
analitza = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz";
- sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv";
- name = "analitza-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz";
+ sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925";
+ name = "analitza-18.12.3.tar.xz";
};
};
ark = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz";
- sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86";
- name = "ark-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz";
+ sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722";
+ name = "ark-18.12.3.tar.xz";
};
};
artikulate = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz";
- sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1";
- name = "artikulate-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz";
+ sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278";
+ name = "artikulate-18.12.3.tar.xz";
};
};
audiocd-kio = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz";
- sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p";
- name = "audiocd-kio-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz";
+ sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8";
+ name = "audiocd-kio-18.12.3.tar.xz";
};
};
baloo-widgets = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz";
- sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3";
- name = "baloo-widgets-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz";
+ sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3";
+ name = "baloo-widgets-18.12.3.tar.xz";
};
};
blinken = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz";
- sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2";
- name = "blinken-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz";
+ sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579";
+ name = "blinken-18.12.3.tar.xz";
};
};
bomber = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz";
- sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d";
- name = "bomber-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz";
+ sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771";
+ name = "bomber-18.12.3.tar.xz";
};
};
bovo = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz";
- sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp";
- name = "bovo-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz";
+ sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972";
+ name = "bovo-18.12.3.tar.xz";
};
};
calendarsupport = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz";
- sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p";
- name = "calendarsupport-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz";
+ sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5";
+ name = "calendarsupport-18.12.3.tar.xz";
};
};
cantor = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz";
- sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc";
- name = "cantor-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz";
+ sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398";
+ name = "cantor-18.12.3.tar.xz";
};
};
cervisia = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz";
- sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7";
- name = "cervisia-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz";
+ sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85";
+ name = "cervisia-18.12.3.tar.xz";
};
};
dolphin = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz";
- sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq";
- name = "dolphin-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz";
+ sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1";
+ name = "dolphin-18.12.3.tar.xz";
};
};
dolphin-plugins = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz";
- sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8";
- name = "dolphin-plugins-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz";
+ sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427";
+ name = "dolphin-plugins-18.12.3.tar.xz";
};
};
dragon = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz";
- sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm";
- name = "dragon-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz";
+ sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3";
+ name = "dragon-18.12.3.tar.xz";
};
};
eventviews = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz";
- sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1";
- name = "eventviews-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz";
+ sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0";
+ name = "eventviews-18.12.3.tar.xz";
};
};
ffmpegthumbs = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz";
- sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki";
- name = "ffmpegthumbs-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz";
+ sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338";
+ name = "ffmpegthumbs-18.12.3.tar.xz";
};
};
filelight = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz";
- sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f";
- name = "filelight-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz";
+ sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a";
+ name = "filelight-18.12.3.tar.xz";
};
};
granatier = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz";
- sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn";
- name = "granatier-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz";
+ sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af";
+ name = "granatier-18.12.3.tar.xz";
};
};
grantlee-editor = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz";
- sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4";
- name = "grantlee-editor-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz";
+ sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c";
+ name = "grantlee-editor-18.12.3.tar.xz";
};
};
grantleetheme = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz";
- sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc";
- name = "grantleetheme-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz";
+ sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402";
+ name = "grantleetheme-18.12.3.tar.xz";
};
};
gwenview = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz";
- sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm";
- name = "gwenview-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz";
+ sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35";
+ name = "gwenview-18.12.3.tar.xz";
};
};
incidenceeditor = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz";
- sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz";
- name = "incidenceeditor-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz";
+ sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02";
+ name = "incidenceeditor-18.12.3.tar.xz";
};
};
juk = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz";
- sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n";
- name = "juk-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz";
+ sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca";
+ name = "juk-18.12.3.tar.xz";
};
};
k3b = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz";
- sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s";
- name = "k3b-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz";
+ sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e";
+ name = "k3b-18.12.3.tar.xz";
};
};
kaccounts-integration = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz";
- sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz";
- name = "kaccounts-integration-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz";
+ sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce";
+ name = "kaccounts-integration-18.12.3.tar.xz";
};
};
kaccounts-providers = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz";
- sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi";
- name = "kaccounts-providers-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz";
+ sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6";
+ name = "kaccounts-providers-18.12.3.tar.xz";
};
};
kaddressbook = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz";
- sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak";
- name = "kaddressbook-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz";
+ sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28";
+ name = "kaddressbook-18.12.3.tar.xz";
};
};
kajongg = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz";
- sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a";
- name = "kajongg-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz";
+ sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9";
+ name = "kajongg-18.12.3.tar.xz";
};
};
kalarm = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz";
- sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil";
- name = "kalarm-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz";
+ sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3";
+ name = "kalarm-18.12.3.tar.xz";
};
};
kalarmcal = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz";
- sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7";
- name = "kalarmcal-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz";
+ sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8";
+ name = "kalarmcal-18.12.3.tar.xz";
};
};
kalgebra = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz";
- sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4";
- name = "kalgebra-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz";
+ sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5";
+ name = "kalgebra-18.12.3.tar.xz";
};
};
kalzium = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz";
- sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7";
- name = "kalzium-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz";
+ sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef";
+ name = "kalzium-18.12.3.tar.xz";
};
};
kamera = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz";
- sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj";
- name = "kamera-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz";
+ sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f";
+ name = "kamera-18.12.3.tar.xz";
};
};
kamoso = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz";
- sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p";
- name = "kamoso-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz";
+ sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3";
+ name = "kamoso-18.12.3.tar.xz";
};
};
kanagram = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz";
- sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx";
- name = "kanagram-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz";
+ sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204";
+ name = "kanagram-18.12.3.tar.xz";
};
};
kapman = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz";
- sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj";
- name = "kapman-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz";
+ sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c";
+ name = "kapman-18.12.3.tar.xz";
};
};
kapptemplate = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz";
- sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa";
- name = "kapptemplate-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz";
+ sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f";
+ name = "kapptemplate-18.12.3.tar.xz";
};
};
kate = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz";
- sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7";
- name = "kate-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz";
+ sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1";
+ name = "kate-18.12.3.tar.xz";
};
};
katomic = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz";
- sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6";
- name = "katomic-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz";
+ sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1";
+ name = "katomic-18.12.3.tar.xz";
};
};
kbackup = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz";
- sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw";
- name = "kbackup-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz";
+ sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf";
+ name = "kbackup-18.12.3.tar.xz";
};
};
kblackbox = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz";
- sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p";
- name = "kblackbox-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz";
+ sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b";
+ name = "kblackbox-18.12.3.tar.xz";
};
};
kblocks = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz";
- sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa";
- name = "kblocks-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz";
+ sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332";
+ name = "kblocks-18.12.3.tar.xz";
};
};
kblog = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz";
- sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x";
- name = "kblog-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz";
+ sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc";
+ name = "kblog-18.12.3.tar.xz";
};
};
kbounce = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz";
- sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355";
- name = "kbounce-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz";
+ sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343";
+ name = "kbounce-18.12.3.tar.xz";
};
};
kbreakout = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz";
- sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq";
- name = "kbreakout-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz";
+ sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af";
+ name = "kbreakout-18.12.3.tar.xz";
};
};
kbruch = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz";
- sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh";
- name = "kbruch-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz";
+ sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d";
+ name = "kbruch-18.12.3.tar.xz";
};
};
kcachegrind = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz";
- sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29";
- name = "kcachegrind-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz";
+ sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf";
+ name = "kcachegrind-18.12.3.tar.xz";
};
};
kcalc = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz";
- sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93";
- name = "kcalc-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz";
+ sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f";
+ name = "kcalc-18.12.3.tar.xz";
};
};
kcalcore = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz";
- sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki";
- name = "kcalcore-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz";
+ sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452";
+ name = "kcalcore-18.12.3.tar.xz";
};
};
kcalutils = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz";
- sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp";
- name = "kcalutils-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz";
+ sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9";
+ name = "kcalutils-18.12.3.tar.xz";
};
};
kcharselect = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz";
- sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6";
- name = "kcharselect-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz";
+ sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb";
+ name = "kcharselect-18.12.3.tar.xz";
};
};
kcolorchooser = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz";
- sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn";
- name = "kcolorchooser-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz";
+ sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228";
+ name = "kcolorchooser-18.12.3.tar.xz";
};
};
kcontacts = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz";
- sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba";
- name = "kcontacts-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz";
+ sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3";
+ name = "kcontacts-18.12.3.tar.xz";
};
};
kcron = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz";
- sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn";
- name = "kcron-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz";
+ sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3";
+ name = "kcron-18.12.3.tar.xz";
};
};
kdav = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz";
- sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77";
- name = "kdav-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz";
+ sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23";
+ name = "kdav-18.12.3.tar.xz";
};
};
kdebugsettings = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz";
- sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3";
- name = "kdebugsettings-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz";
+ sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7";
+ name = "kdebugsettings-18.12.3.tar.xz";
};
};
kde-dev-scripts = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz";
- sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3";
- name = "kde-dev-scripts-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz";
+ sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4";
+ name = "kde-dev-scripts-18.12.3.tar.xz";
};
};
kde-dev-utils = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz";
- sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj";
- name = "kde-dev-utils-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz";
+ sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6";
+ name = "kde-dev-utils-18.12.3.tar.xz";
};
};
kdeedu-data = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz";
- sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq";
- name = "kdeedu-data-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz";
+ sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999";
+ name = "kdeedu-data-18.12.3.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz";
- sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq";
- name = "kdegraphics-mobipocket-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz";
+ sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52";
+ name = "kdegraphics-mobipocket-18.12.3.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz";
- sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj";
- name = "kdegraphics-thumbnailers-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz";
+ sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0";
+ name = "kdegraphics-thumbnailers-18.12.3.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz";
- sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4";
- name = "kdenetwork-filesharing-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz";
+ sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503";
+ name = "kdenetwork-filesharing-18.12.3.tar.xz";
};
};
kdenlive = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz";
- sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf";
- name = "kdenlive-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz";
+ sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64";
+ name = "kdenlive-18.12.3.tar.xz";
};
};
kdepim-addons = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz";
- sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp";
- name = "kdepim-addons-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz";
+ sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5";
+ name = "kdepim-addons-18.12.3.tar.xz";
};
};
kdepim-apps-libs = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz";
- sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i";
- name = "kdepim-apps-libs-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz";
+ sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164";
+ name = "kdepim-apps-libs-18.12.3.tar.xz";
};
};
kdepim-runtime = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz";
- sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc";
- name = "kdepim-runtime-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz";
+ sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3";
+ name = "kdepim-runtime-18.12.3.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz";
- sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69";
- name = "kdesdk-kioslaves-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz";
+ sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad";
+ name = "kdesdk-kioslaves-18.12.3.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz";
- sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb";
- name = "kdesdk-thumbnailers-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz";
+ sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b";
+ name = "kdesdk-thumbnailers-18.12.3.tar.xz";
};
};
kdf = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz";
- sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11";
- name = "kdf-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz";
+ sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae";
+ name = "kdf-18.12.3.tar.xz";
};
};
kdialog = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz";
- sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2";
- name = "kdialog-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz";
+ sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212";
+ name = "kdialog-18.12.3.tar.xz";
};
};
kdiamond = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz";
- sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4";
- name = "kdiamond-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz";
+ sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500";
+ name = "kdiamond-18.12.3.tar.xz";
};
};
keditbookmarks = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz";
- sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1";
- name = "keditbookmarks-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz";
+ sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d";
+ name = "keditbookmarks-18.12.3.tar.xz";
};
};
kfind = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz";
- sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b";
- name = "kfind-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz";
+ sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9";
+ name = "kfind-18.12.3.tar.xz";
};
};
kfloppy = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz";
- sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq";
- name = "kfloppy-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz";
+ sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363";
+ name = "kfloppy-18.12.3.tar.xz";
};
};
kfourinline = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz";
- sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g";
- name = "kfourinline-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz";
+ sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce";
+ name = "kfourinline-18.12.3.tar.xz";
};
};
kgeography = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz";
- sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf";
- name = "kgeography-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz";
+ sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9";
+ name = "kgeography-18.12.3.tar.xz";
};
};
kget = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz";
- sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb";
- name = "kget-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz";
+ sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86";
+ name = "kget-18.12.3.tar.xz";
};
};
kgoldrunner = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz";
- sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba";
- name = "kgoldrunner-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz";
+ sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6";
+ name = "kgoldrunner-18.12.3.tar.xz";
};
};
kgpg = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz";
- sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y";
- name = "kgpg-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz";
+ sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8";
+ name = "kgpg-18.12.3.tar.xz";
};
};
khangman = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz";
- sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q";
- name = "khangman-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz";
+ sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013";
+ name = "khangman-18.12.3.tar.xz";
};
};
khelpcenter = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz";
- sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y";
- name = "khelpcenter-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz";
+ sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8";
+ name = "khelpcenter-18.12.3.tar.xz";
};
};
kidentitymanagement = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz";
- sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq";
- name = "kidentitymanagement-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz";
+ sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662";
+ name = "kidentitymanagement-18.12.3.tar.xz";
};
};
kig = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz";
- sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc";
- name = "kig-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz";
+ sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2";
+ name = "kig-18.12.3.tar.xz";
};
};
kigo = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz";
- sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2";
- name = "kigo-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz";
+ sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484";
+ name = "kigo-18.12.3.tar.xz";
};
};
killbots = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz";
- sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43";
- name = "killbots-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz";
+ sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9";
+ name = "killbots-18.12.3.tar.xz";
};
};
kimagemapeditor = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz";
- sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4";
- name = "kimagemapeditor-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz";
+ sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6";
+ name = "kimagemapeditor-18.12.3.tar.xz";
};
};
kimap = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz";
- sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm";
- name = "kimap-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz";
+ sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992";
+ name = "kimap-18.12.3.tar.xz";
};
};
kio-extras = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz";
- sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3";
- name = "kio-extras-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz";
+ sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2";
+ name = "kio-extras-18.12.3.tar.xz";
};
};
kirigami-gallery = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz";
- sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0";
- name = "kirigami-gallery-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz";
+ sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39";
+ name = "kirigami-gallery-18.12.3.tar.xz";
};
};
kiriki = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz";
- sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz";
- name = "kiriki-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz";
+ sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac";
+ name = "kiriki-18.12.3.tar.xz";
};
};
kiten = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz";
- sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947";
- name = "kiten-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz";
+ sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf";
+ name = "kiten-18.12.3.tar.xz";
};
};
kitinerary = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz";
- sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws";
- name = "kitinerary-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz";
+ sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35";
+ name = "kitinerary-18.12.3.tar.xz";
};
};
kjumpingcube = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz";
- sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih";
- name = "kjumpingcube-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz";
+ sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993";
+ name = "kjumpingcube-18.12.3.tar.xz";
};
};
kldap = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz";
- sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn";
- name = "kldap-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz";
+ sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e";
+ name = "kldap-18.12.3.tar.xz";
};
};
kleopatra = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz";
- sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj";
- name = "kleopatra-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz";
+ sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b";
+ name = "kleopatra-18.12.3.tar.xz";
};
};
klettres = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz";
- sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk";
- name = "klettres-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz";
+ sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93";
+ name = "klettres-18.12.3.tar.xz";
};
};
klickety = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz";
- sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy";
- name = "klickety-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz";
+ sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5";
+ name = "klickety-18.12.3.tar.xz";
};
};
klines = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz";
- sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf";
- name = "klines-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz";
+ sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80";
+ name = "klines-18.12.3.tar.xz";
};
};
kmag = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz";
- sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw";
- name = "kmag-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz";
+ sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba";
+ name = "kmag-18.12.3.tar.xz";
};
};
kmahjongg = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz";
- sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd";
- name = "kmahjongg-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz";
+ sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6";
+ name = "kmahjongg-18.12.3.tar.xz";
};
};
kmail = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz";
- sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7";
- name = "kmail-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz";
+ sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76";
+ name = "kmail-18.12.3.tar.xz";
};
};
kmail-account-wizard = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz";
- sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3";
- name = "kmail-account-wizard-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz";
+ sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df";
+ name = "kmail-account-wizard-18.12.3.tar.xz";
};
};
kmailtransport = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz";
- sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm";
- name = "kmailtransport-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz";
+ sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1";
+ name = "kmailtransport-18.12.3.tar.xz";
};
};
kmbox = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz";
- sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf";
- name = "kmbox-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz";
+ sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841";
+ name = "kmbox-18.12.3.tar.xz";
};
};
kmime = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz";
- sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2";
- name = "kmime-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz";
+ sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274";
+ name = "kmime-18.12.3.tar.xz";
};
};
kmines = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz";
- sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi";
- name = "kmines-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz";
+ sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f";
+ name = "kmines-18.12.3.tar.xz";
};
};
kmix = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz";
- sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73";
- name = "kmix-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz";
+ sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a";
+ name = "kmix-18.12.3.tar.xz";
};
};
kmousetool = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz";
- sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x";
- name = "kmousetool-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz";
+ sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8";
+ name = "kmousetool-18.12.3.tar.xz";
};
};
kmouth = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz";
- sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5";
- name = "kmouth-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz";
+ sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486";
+ name = "kmouth-18.12.3.tar.xz";
};
};
kmplot = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz";
- sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf";
- name = "kmplot-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz";
+ sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b";
+ name = "kmplot-18.12.3.tar.xz";
};
};
knavalbattle = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz";
- sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8";
- name = "knavalbattle-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz";
+ sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3";
+ name = "knavalbattle-18.12.3.tar.xz";
};
};
knetwalk = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz";
- sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c";
- name = "knetwalk-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz";
+ sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f";
+ name = "knetwalk-18.12.3.tar.xz";
};
};
knights = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz";
- sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2";
- name = "knights-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz";
+ sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990";
+ name = "knights-18.12.3.tar.xz";
};
};
knotes = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz";
- sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz";
- name = "knotes-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz";
+ sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578";
+ name = "knotes-18.12.3.tar.xz";
};
};
kolf = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz";
- sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i";
- name = "kolf-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz";
+ sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f";
+ name = "kolf-18.12.3.tar.xz";
};
};
kollision = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz";
- sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl";
- name = "kollision-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz";
+ sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856";
+ name = "kollision-18.12.3.tar.xz";
};
};
kolourpaint = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz";
- sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd";
- name = "kolourpaint-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz";
+ sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98";
+ name = "kolourpaint-18.12.3.tar.xz";
};
};
kompare = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz";
- sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9";
- name = "kompare-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz";
+ sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285";
+ name = "kompare-18.12.3.tar.xz";
};
};
konqueror = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz";
- sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy";
- name = "konqueror-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz";
+ sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a";
+ name = "konqueror-18.12.3.tar.xz";
};
};
konquest = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz";
- sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483";
- name = "konquest-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz";
+ sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172";
+ name = "konquest-18.12.3.tar.xz";
};
};
konsole = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz";
- sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg";
- name = "konsole-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz";
+ sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08";
+ name = "konsole-18.12.3.tar.xz";
};
};
kontact = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz";
- sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag";
- name = "kontact-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz";
+ sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315";
+ name = "kontact-18.12.3.tar.xz";
};
};
kontactinterface = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz";
- sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61";
- name = "kontactinterface-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz";
+ sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41";
+ name = "kontactinterface-18.12.3.tar.xz";
};
};
kopete = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz";
- sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs";
- name = "kopete-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz";
+ sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b";
+ name = "kopete-18.12.3.tar.xz";
};
};
korganizer = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz";
- sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg";
- name = "korganizer-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz";
+ sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c";
+ name = "korganizer-18.12.3.tar.xz";
};
};
kpat = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz";
- sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a";
- name = "kpat-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz";
+ sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377";
+ name = "kpat-18.12.3.tar.xz";
};
};
kpimtextedit = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz";
- sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb";
- name = "kpimtextedit-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz";
+ sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d";
+ name = "kpimtextedit-18.12.3.tar.xz";
};
};
kpkpass = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz";
- sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx";
- name = "kpkpass-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz";
+ sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f";
+ name = "kpkpass-18.12.3.tar.xz";
};
};
kqtquickcharts = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz";
- sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl";
- name = "kqtquickcharts-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz";
+ sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe";
+ name = "kqtquickcharts-18.12.3.tar.xz";
};
};
krdc = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz";
- sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx";
- name = "krdc-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz";
+ sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666";
+ name = "krdc-18.12.3.tar.xz";
};
};
kreversi = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz";
- sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4";
- name = "kreversi-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz";
+ sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc";
+ name = "kreversi-18.12.3.tar.xz";
};
};
krfb = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz";
- sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4";
- name = "krfb-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz";
+ sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b";
+ name = "krfb-18.12.3.tar.xz";
};
};
kross-interpreters = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz";
- sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src";
- name = "kross-interpreters-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz";
+ sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c";
+ name = "kross-interpreters-18.12.3.tar.xz";
};
};
kruler = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz";
- sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6";
- name = "kruler-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz";
+ sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33";
+ name = "kruler-18.12.3.tar.xz";
};
};
kshisen = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz";
- sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x";
- name = "kshisen-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz";
+ sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f";
+ name = "kshisen-18.12.3.tar.xz";
};
};
ksirk = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz";
- sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf";
- name = "ksirk-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz";
+ sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a";
+ name = "ksirk-18.12.3.tar.xz";
};
};
ksmtp = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz";
- sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas";
- name = "ksmtp-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz";
+ sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74";
+ name = "ksmtp-18.12.3.tar.xz";
};
};
ksnakeduel = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz";
- sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql";
- name = "ksnakeduel-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz";
+ sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36";
+ name = "ksnakeduel-18.12.3.tar.xz";
};
};
kspaceduel = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz";
- sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw";
- name = "kspaceduel-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz";
+ sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11";
+ name = "kspaceduel-18.12.3.tar.xz";
};
};
ksquares = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz";
- sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb";
- name = "ksquares-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz";
+ sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d";
+ name = "ksquares-18.12.3.tar.xz";
};
};
ksudoku = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz";
- sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs";
- name = "ksudoku-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz";
+ sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1";
+ name = "ksudoku-18.12.3.tar.xz";
};
};
ksystemlog = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz";
- sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c";
- name = "ksystemlog-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz";
+ sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52";
+ name = "ksystemlog-18.12.3.tar.xz";
};
};
kteatime = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz";
- sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg";
- name = "kteatime-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz";
+ sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d";
+ name = "kteatime-18.12.3.tar.xz";
};
};
ktimer = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz";
- sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf";
- name = "ktimer-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz";
+ sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e";
+ name = "ktimer-18.12.3.tar.xz";
};
};
ktnef = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz";
- sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69";
- name = "ktnef-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz";
+ sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec";
+ name = "ktnef-18.12.3.tar.xz";
};
};
ktouch = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz";
- sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5";
- name = "ktouch-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz";
+ sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6";
+ name = "ktouch-18.12.3.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz";
- sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn";
- name = "ktp-accounts-kcm-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz";
+ sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb";
+ name = "ktp-accounts-kcm-18.12.3.tar.xz";
};
};
ktp-approver = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz";
- sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah";
- name = "ktp-approver-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz";
+ sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6";
+ name = "ktp-approver-18.12.3.tar.xz";
};
};
ktp-auth-handler = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz";
- sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28";
- name = "ktp-auth-handler-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz";
+ sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be";
+ name = "ktp-auth-handler-18.12.3.tar.xz";
};
};
ktp-call-ui = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz";
- sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3";
- name = "ktp-call-ui-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz";
+ sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571";
+ name = "ktp-call-ui-18.12.3.tar.xz";
};
};
ktp-common-internals = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz";
- sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp";
- name = "ktp-common-internals-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz";
+ sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740";
+ name = "ktp-common-internals-18.12.3.tar.xz";
};
};
ktp-contact-list = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz";
- sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw";
- name = "ktp-contact-list-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz";
+ sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1";
+ name = "ktp-contact-list-18.12.3.tar.xz";
};
};
ktp-contact-runner = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz";
- sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34";
- name = "ktp-contact-runner-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz";
+ sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9";
+ name = "ktp-contact-runner-18.12.3.tar.xz";
};
};
ktp-desktop-applets = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz";
- sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn";
- name = "ktp-desktop-applets-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz";
+ sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4";
+ name = "ktp-desktop-applets-18.12.3.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz";
- sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx";
- name = "ktp-filetransfer-handler-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz";
+ sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231";
+ name = "ktp-filetransfer-handler-18.12.3.tar.xz";
};
};
ktp-kded-module = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz";
- sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs";
- name = "ktp-kded-module-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz";
+ sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854";
+ name = "ktp-kded-module-18.12.3.tar.xz";
};
};
ktp-send-file = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz";
- sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163";
- name = "ktp-send-file-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz";
+ sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2";
+ name = "ktp-send-file-18.12.3.tar.xz";
};
};
ktp-text-ui = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz";
- sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy";
- name = "ktp-text-ui-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz";
+ sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e";
+ name = "ktp-text-ui-18.12.3.tar.xz";
};
};
ktuberling = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz";
- sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk";
- name = "ktuberling-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz";
+ sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04";
+ name = "ktuberling-18.12.3.tar.xz";
};
};
kturtle = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz";
- sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1";
- name = "kturtle-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz";
+ sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253";
+ name = "kturtle-18.12.3.tar.xz";
};
};
kubrick = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz";
- sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll";
- name = "kubrick-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz";
+ sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3";
+ name = "kubrick-18.12.3.tar.xz";
};
};
kwalletmanager = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz";
- sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn";
- name = "kwalletmanager-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz";
+ sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478";
+ name = "kwalletmanager-18.12.3.tar.xz";
};
};
kwave = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz";
- sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3";
- name = "kwave-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz";
+ sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48";
+ name = "kwave-18.12.3.tar.xz";
};
};
kwordquiz = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz";
- sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf";
- name = "kwordquiz-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz";
+ sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc";
+ name = "kwordquiz-18.12.3.tar.xz";
};
};
libgravatar = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz";
- sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6";
- name = "libgravatar-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz";
+ sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee";
+ name = "libgravatar-18.12.3.tar.xz";
};
};
libkcddb = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz";
- sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155";
- name = "libkcddb-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz";
+ sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29";
+ name = "libkcddb-18.12.3.tar.xz";
};
};
libkcompactdisc = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz";
- sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac";
- name = "libkcompactdisc-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz";
+ sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926";
+ name = "libkcompactdisc-18.12.3.tar.xz";
};
};
libkdcraw = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz";
- sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c";
- name = "libkdcraw-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz";
+ sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99";
+ name = "libkdcraw-18.12.3.tar.xz";
};
};
libkdegames = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz";
- sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65";
- name = "libkdegames-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz";
+ sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9";
+ name = "libkdegames-18.12.3.tar.xz";
};
};
libkdepim = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz";
- sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp";
- name = "libkdepim-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz";
+ sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640";
+ name = "libkdepim-18.12.3.tar.xz";
};
};
libkeduvocdocument = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz";
- sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w";
- name = "libkeduvocdocument-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz";
+ sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4";
+ name = "libkeduvocdocument-18.12.3.tar.xz";
};
};
libkexiv2 = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz";
- sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3";
- name = "libkexiv2-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz";
+ sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc";
+ name = "libkexiv2-18.12.3.tar.xz";
};
};
libkgapi = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz";
- sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3";
- name = "libkgapi-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz";
+ sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924";
+ name = "libkgapi-18.12.3.tar.xz";
};
};
libkgeomap = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz";
- sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz";
- name = "libkgeomap-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz";
+ sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b";
+ name = "libkgeomap-18.12.3.tar.xz";
};
};
libkipi = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz";
- sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv";
- name = "libkipi-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz";
+ sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31";
+ name = "libkipi-18.12.3.tar.xz";
};
};
libkleo = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz";
- sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x";
- name = "libkleo-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz";
+ sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69";
+ name = "libkleo-18.12.3.tar.xz";
};
};
libkmahjongg = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz";
- sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv";
- name = "libkmahjongg-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz";
+ sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4";
+ name = "libkmahjongg-18.12.3.tar.xz";
};
};
libkomparediff2 = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz";
- sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn";
- name = "libkomparediff2-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz";
+ sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c";
+ name = "libkomparediff2-18.12.3.tar.xz";
};
};
libksane = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz";
- sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8";
- name = "libksane-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz";
+ sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034";
+ name = "libksane-18.12.3.tar.xz";
};
};
libksieve = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz";
- sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1";
- name = "libksieve-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz";
+ sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754";
+ name = "libksieve-18.12.3.tar.xz";
};
};
lokalize = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz";
- sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g";
- name = "lokalize-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz";
+ sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed";
+ name = "lokalize-18.12.3.tar.xz";
};
};
lskat = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz";
- sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm";
- name = "lskat-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz";
+ sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2";
+ name = "lskat-18.12.3.tar.xz";
};
};
mailcommon = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz";
- sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2";
- name = "mailcommon-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz";
+ sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1";
+ name = "mailcommon-18.12.3.tar.xz";
};
};
mailimporter = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz";
- sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98";
- name = "mailimporter-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz";
+ sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3";
+ name = "mailimporter-18.12.3.tar.xz";
};
};
marble = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz";
- sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy";
- name = "marble-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz";
+ sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee";
+ name = "marble-18.12.3.tar.xz";
};
};
mbox-importer = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz";
- sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n";
- name = "mbox-importer-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz";
+ sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201";
+ name = "mbox-importer-18.12.3.tar.xz";
};
};
messagelib = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz";
- sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8";
- name = "messagelib-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz";
+ sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8";
+ name = "messagelib-18.12.3.tar.xz";
};
};
minuet = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz";
- sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz";
- name = "minuet-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz";
+ sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009";
+ name = "minuet-18.12.3.tar.xz";
};
};
okular = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz";
- sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl";
- name = "okular-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz";
+ sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab";
+ name = "okular-18.12.3.tar.xz";
};
};
palapeli = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz";
- sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd";
- name = "palapeli-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz";
+ sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593";
+ name = "palapeli-18.12.3.tar.xz";
};
};
parley = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz";
- sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z";
- name = "parley-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz";
+ sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75";
+ name = "parley-18.12.3.tar.xz";
};
};
picmi = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz";
- sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v";
- name = "picmi-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz";
+ sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49";
+ name = "picmi-18.12.3.tar.xz";
};
};
pimcommon = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz";
- sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z";
- name = "pimcommon-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz";
+ sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e";
+ name = "pimcommon-18.12.3.tar.xz";
};
};
pim-data-exporter = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz";
- sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb";
- name = "pim-data-exporter-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz";
+ sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941";
+ name = "pim-data-exporter-18.12.3.tar.xz";
};
};
pim-sieve-editor = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz";
- sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67";
- name = "pim-sieve-editor-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz";
+ sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5";
+ name = "pim-sieve-editor-18.12.3.tar.xz";
};
};
poxml = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz";
- sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb";
- name = "poxml-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz";
+ sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7";
+ name = "poxml-18.12.3.tar.xz";
};
};
print-manager = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz";
- sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr";
- name = "print-manager-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz";
+ sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d";
+ name = "print-manager-18.12.3.tar.xz";
};
};
rocs = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz";
- sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9";
- name = "rocs-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz";
+ sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11";
+ name = "rocs-18.12.3.tar.xz";
};
};
signon-kwallet-extension = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz";
- sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n";
- name = "signon-kwallet-extension-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz";
+ sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f";
+ name = "signon-kwallet-extension-18.12.3.tar.xz";
};
};
spectacle = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz";
- sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9";
- name = "spectacle-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz";
+ sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e";
+ name = "spectacle-18.12.3.tar.xz";
};
};
step = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz";
- sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4";
- name = "step-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz";
+ sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755";
+ name = "step-18.12.3.tar.xz";
};
};
svgpart = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz";
- sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s";
- name = "svgpart-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz";
+ sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef";
+ name = "svgpart-18.12.3.tar.xz";
};
};
sweeper = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz";
- sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4";
- name = "sweeper-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz";
+ sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0";
+ name = "sweeper-18.12.3.tar.xz";
};
};
umbrello = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz";
- sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r";
- name = "umbrello-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz";
+ sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7";
+ name = "umbrello-18.12.3.tar.xz";
};
};
zeroconf-ioslave = {
- version = "18.12.1";
+ version = "18.12.3";
src = fetchurl {
- url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz";
- sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp";
- name = "zeroconf-ioslave-18.12.1.tar.xz";
+ url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz";
+ sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12";
+ name = "zeroconf-ioslave-18.12.3.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 75783805fa3b..e0fd33d5e612 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -7,7 +7,7 @@
# Gtk deps
# upstream gImagereader supports Qt too
, gtk3, gobject-introspection, wrapGAppsHook
-, gnome3, gtkspell3, gtkspellmm, cairomm
+, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm
}:
let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
poppler
# Gtk specific
- gnome3.gtkmm
+ gtkmm3
gtkspell3
gtkspellmm
- gnome3.gtksourceview
- gnome3.gtksourceviewmm
+ gtksourceview3
+ gtksourceviewmm
cairomm
json-glib
];
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index e6c66cba1e06..4490ff60a5b9 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -29,15 +29,15 @@ GEM
sanitize (~> 2.1.1, >= 2.1.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
- json (2.1.0)
+ json (2.2.0)
kramdown (1.9.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2018.0812)
- mini_portile2 (2.3.0)
+ mime-types-data (3.2019.0331)
+ mini_portile2 (2.4.0)
mustache (0.99.8)
- nokogiri (1.8.4)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.2)
+ mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
rack (1.6.11)
rack-protection (1.5.5)
@@ -49,8 +49,8 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
- stringex (2.8.4)
- tilt (2.0.8)
+ stringex (2.8.5)
+ tilt (2.0.9)
twitter-text (1.14.7)
unf (~> 0.1.0)
unf (0.1.4)
@@ -65,4 +65,4 @@ DEPENDENCIES
gollum
BUNDLED WITH
- 1.16.4
+ 1.17.2
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index bb105805ca8e..bef80a95bbb5 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -1,5 +1,7 @@
{
charlock_holmes = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
@@ -8,6 +10,8 @@
version = "0.7.6";
};
diff-lcs = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
@@ -17,6 +21,8 @@
};
gemojione = {
dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
@@ -25,6 +31,8 @@
version = "3.3.0";
};
github-markup = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
@@ -34,6 +42,8 @@
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
@@ -43,6 +53,8 @@
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7";
@@ -52,6 +64,8 @@
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
@@ -61,6 +75,8 @@
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf";
@@ -69,14 +85,18 @@
version = "4.2.10";
};
json = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
kramdown = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
@@ -86,6 +106,8 @@
};
mime-types = {
dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
@@ -94,22 +116,28 @@
version = "3.2.2";
};
mime-types-data = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
- version = "3.2018.0812";
+ version = "3.2019.0331";
};
mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
mustache = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
@@ -119,14 +147,18 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+ sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
- version = "1.8.4";
+ version = "1.10.2";
};
posix-spawn = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
@@ -135,6 +167,8 @@
version = "0.3.13";
};
rack = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
@@ -144,6 +178,8 @@
};
rack-protection = {
dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
@@ -152,6 +188,8 @@
version = "1.5.5";
};
rouge = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
@@ -161,6 +199,8 @@
};
sanitize = {
dependencies = ["nokogiri"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898";
@@ -170,6 +210,8 @@
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -178,23 +220,29 @@
version = "1.4.8";
};
stringex = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
+ sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
type = "gem";
};
- version = "2.8.4";
+ version = "2.8.5";
};
tilt = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
type = "gem";
};
- version = "2.0.8";
+ version = "2.0.9";
};
twitter-text = {
dependencies = ["unf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
@@ -204,6 +252,8 @@
};
unf = {
dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -212,6 +262,8 @@
version = "0.1.4";
};
unf_ext = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
@@ -220,6 +272,8 @@
version = "0.0.7.5";
};
useragent = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p";
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 4b5c17d8e51b..7ff7f6f811f7 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, python}:
stdenv.mkDerivation rec {
- version = "3.7.1";
+ version = "3.8";
name = "googler-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "googler";
rev = "v${version}";
- sha256 = "0dcszpz85h3yjnr55ixf8mzsdv46w3g27frhgcsl5zlsgk6vl8kw";
+ sha256 = "0f15rivjdj8r7wwrckcsaxxx129yh41fj4rhz4cbvbsb5f0f2daj";
};
propagatedBuildInputs = [ python ];
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 5131e0739e73..9313199efb82 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gphoto2-2.5.17";
+ name = "gphoto2-2.5.20";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa";
+ sha256 = "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3";
};
nativeBuildInputs = [ pkgconfig gettext libtool ];
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index 8401386ead49..a9e6d905c284 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
+{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "gxmessage-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
+ buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ];
meta = {
description = "A GTK enabled dropin replacement for xmessage";
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index fa2ac38d383b..e493226be60a 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj
'';
+ preConfigure = "LD=$CC";
makeFlagsArray = ["Deployment"];
installPhase = ''
mkdir -p "$out/Applications"
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 8fab25fbce02..32d10712b763 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
stdenv.mkDerivation rec {
name = "josm-${version}";
@@ -21,12 +21,14 @@ stdenv.mkDerivation rec {
categories = "Education;Geoscience;Maps;";
};
+ # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
buildCommand = ''
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar
makeWrapper ${jdk11}/bin/java $out/bin/josm \
- --add-flags "-jar $out/share/java/josm.jar"
+ --add-flags "-jar $out/share/java/josm.jar" \
+ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index da0c8c38e73d..2e32bbd611a1 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -2,18 +2,17 @@
with python3.pkgs; buildPythonApplication rec {
pname = "khal";
- version = "0.9.10";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4";
+ sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l";
};
- LC_ALL = "en_US.UTF-8";
-
propagatedBuildInputs = [
atomicwrites
click
+ click-log
configobj
dateutil
icalendar
@@ -27,15 +26,14 @@ with python3.pkgs; buildPythonApplication rec {
pkginfo
freezegun
];
- nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
+ nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest ];
postInstall = ''
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;
+ doCheck = !stdenv.isAarch64;
checkPhase = ''
py.test
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 58b6ae9aae83..3edb48cc489b 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -2,7 +2,20 @@
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
- which, dbus
+ which, dbus,
+ Cocoa,
+ CoreGraphics,
+ Foundation,
+ IOKit,
+ Kernel,
+ OpenGL,
+ cf-private,
+ libicns,
+ libpng,
+ librsvg,
+ optipng,
+ python3,
+ zlib,
}:
with python3Packages;
@@ -19,12 +32,32 @@ buildPythonApplication rec {
};
buildInputs = [
- fontconfig glfw ncurses libunistring harfbuzz libX11
+ ncurses harfbuzz
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ Cocoa
+ CoreGraphics
+ Foundation
+ IOKit
+ Kernel
+ OpenGL
+ cf-private
+ libpng
+ python3
+ zlib
+ ] ++ stdenv.lib.optionals stdenv.isLinux [
+ fontconfig glfw libunistring libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
wayland-protocols wayland dbus
];
- nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
+ nativeBuildInputs = [
+ pkgconfig which sphinx ncurses
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ imagemagick
+ libicns # For the png2icns tool.
+ librsvg
+ optipng
+ ];
outputs = [ "out" "terminfo" ];
@@ -33,16 +66,30 @@ buildPythonApplication rec {
src = ./fix-paths.patch;
libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
})
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ ./macos-10.11.patch
+ ./no-lto.patch
+ ./no-werror.patch
+ ./png2icns.patch
];
- buildPhase = ''
+ buildPhase = if stdenv.isDarwin then ''
+ make app
+ '' else ''
${python.interpreter} setup.py linux-package
'';
installPhase = ''
runHook preInstall
mkdir -p $out
+ ${if stdenv.isDarwin then ''
+ mkdir "$out/bin"
+ ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
+ mkdir "$out/Applications"
+ cp -r kitty.app "$out/Applications/kitty.app"
+ '' else ''
cp -r linux-package/{bin,share,lib} $out
+ ''}
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}"
runHook postInstall
@@ -54,8 +101,13 @@ buildPythonApplication rec {
'';
postInstall = ''
+ terminfo_src=${if stdenv.isDarwin then
+ ''"$out/Applications/kitty.app/Contents/Resources/terminfo"''
+ else
+ "$out/share/terminfo"}
+
mkdir -p $terminfo/share
- mv $out/share/terminfo $terminfo/share/terminfo
+ mv "$terminfo_src" $terminfo/share/terminfo
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
@@ -65,7 +117,7 @@ buildPythonApplication rec {
homepage = https://github.com/kovidgoyal/kitty;
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs ];
};
}
diff --git a/pkgs/applications/misc/kitty/macos-10.11.patch b/pkgs/applications/misc/kitty/macos-10.11.patch
new file mode 100644
index 000000000000..c8bf46839e8a
--- /dev/null
+++ b/pkgs/applications/misc/kitty/macos-10.11.patch
@@ -0,0 +1,116 @@
+commit 749772b8b8179eb3b71e542fd9ed5621feb578f5
+Author: Matthew Glazar
+Date: Thu Feb 28 22:01:32 2019 -0800
+
+ Support macOS 10.11
+
+ Allow Kitty to run on macOS 10.11 El Capitan.
+
+diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m
+index 1e719d2e..05a680e4 100644
+--- a/glfw/cocoa_init.m
++++ b/glfw/cocoa_init.m
+@@ -30,6 +30,10 @@
+ #define NSEventMaskKeyUp NSKeyUpMask
+ #define NSEventMaskKeyDown NSKeyDownMask
+ #define NSEventModifierFlagCommand NSCommandKeyMask
++ #define NSEventModifierFlagControl NSControlKeyMask
++ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
++ #define NSEventModifierFlagShift NSShiftKeyMask
++ #define NSEventTypeApplicationDefined NSApplicationDefined
+ #endif
+
+ // Change to our application bundle's resources directory, if present
+diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
+index 1ce79b56..fd2255fc 100644
+--- a/glfw/cocoa_window.m
++++ b/glfw/cocoa_window.m
+@@ -41,6 +41,7 @@
+ #define NSWindowStyleMaskTitled NSTitledWindowMask
+ #define NSEventModifierFlagCommand NSCommandKeyMask
+ #define NSEventModifierFlagControl NSControlKeyMask
++ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask
+ #define NSEventModifierFlagOption NSAlternateKeyMask
+ #define NSEventModifierFlagShift NSShiftKeyMask
+ #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
+diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m
+index 5e9252ba..99eb3352 100644
+--- a/kitty/cocoa_window.m
++++ b/kitty/cocoa_window.m
+@@ -15,6 +15,9 @@
+ #include
+
+ #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
++typedef NSUInteger NSWindowStyleMask;
++#define NSWindowStyleMaskBorderless NSBorderlessWindowMask
++#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask
+ #define NSWindowStyleMaskResizable NSResizableWindowMask
+ #define NSEventModifierFlagOption NSAlternateKeyMask
+ #define NSEventModifierFlagCommand NSCommandKeyMask
+diff --git a/kitty/logging.c b/kitty/logging.c
+index 45c88174..1ec9f1b0 100644
+--- a/kitty/logging.c
++++ b/kitty/logging.c
+@@ -5,12 +5,21 @@
+ * Distributed under terms of the GPL3 license.
+ */
+
++#ifdef __APPLE__
++#include
++#endif
++#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12
++#define USE_APPLE_OS_LOG 1
++#else
++#define USE_APPLE_OS_LOG 0
++#endif
++
+ #include "data-types.h"
+ #include
+ #include
+ #include
+ #include
+-#ifdef __APPLE__
++#if USE_APPLE_OS_LOG
+ #include
+ #endif
+
+@@ -21,7 +30,7 @@ void
+ log_error(const char *fmt, ...) {
+ va_list ar;
+ struct timeval tv;
+-#ifdef __APPLE__
++#if USE_APPLE_OS_LOG
+ // Apple does not provide a varargs style os_logv
+ char logbuf[16 * 1024] = {0};
+ #else
+@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) {
+ if (use_os_log) { bufprint(vsnprintf, fmt, ar); }
+ else vfprintf(stderr, fmt, ar);
+ va_end(ar);
+-#ifdef __APPLE__
++#if USE_APPLE_OS_LOG
+ if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf);
+ #endif
+ if (!use_os_log) fprintf(stderr, "\n");
+@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = {
+ bool
+ init_logging(PyObject *module) {
+ if (PyModule_AddFunctions(module, module_methods) != 0) return false;
+-#ifdef __APPLE__
++#if USE_APPLE_OS_LOG
+ if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true;
+ #endif
+ return true;
+diff --git a/setup.py b/setup.py
+index f8643fce..55a96e73 100755
+--- a/setup.py
++++ b/setup.py
+@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator;
+ CFBundlePackageType='APPL',
+ CFBundleSignature='????',
+ CFBundleExecutable=appname,
+- LSMinimumSystemVersion='10.12.0',
++ LSMinimumSystemVersion='10.11.0',
+ LSRequiresNativeExecution=True,
+ NSAppleScriptEnabled=False,
+ # Needed for dark mode in Mojave when linking against older SDKs
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch
new file mode 100644
index 000000000000..c5fdeb7ddc03
--- /dev/null
+++ b/pkgs/applications/misc/kitty/no-lto.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -223,9 +223,6 @@ def init_env(
+ cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
+ cflags += shlex.split(os.environ.get('CFLAGS', ''))
+ ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
+- if not debug and not sanitize:
+- # See https://github.com/google/sanitizers/issues/647
+- cflags.append('-flto'), ldflags.append('-flto')
+
+ if profile:
+ cppflags.append('-DWITH_PROFILER')
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch
new file mode 100644
index 000000000000..c9b6dcd6b694
--- /dev/null
+++ b/pkgs/applications/misc/kitty/no-werror.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -202,7 +202,7 @@ def init_env(
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -std=c11'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/pkgs/applications/misc/kitty/png2icns.patch
new file mode 100644
index 000000000000..d2d0806c862f
--- /dev/null
+++ b/pkgs/applications/misc/kitty/png2icns.patch
@@ -0,0 +1,19 @@
+--- a/setup.py
++++ b/setup.py
+@@ -744,9 +744,15 @@ Categories=System;TerminalEmulator;
+ if not os.path.exists(logo_dir):
+ raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py')
+ subprocess.check_call([
+- 'iconutil', '-c', 'icns', logo_dir, '-o',
++ 'png2icns',
+ os.path.join('Resources', os.path.basename(logo_dir).partition('.')[0] + '.icns')
+- ])
++ ] + [os.path.join(logo_dir, logo) for logo in (
++ 'icon_128x128.png',
++ 'icon_16x16.png',
++ 'icon_256x256.png',
++ 'icon_32x32.png',
++ 'icon_512x512.png',
++ )])
+ # }}}
+ # }}}
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 2928d271efcf..928a1bae108a 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
let
- version = "5.2.20";
+ version = "5.3.22";
in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
- sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
+ sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index e173f6d0d7d5..76a0a5748081 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -19,6 +19,9 @@ let
(mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
(mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
(mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
+
+ # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134
+ (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c")
]);
};
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 82468e1bf9f0..11c643fac2c3 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
name = "polar-bookshelf-${version}";
- version = "1.12.0";
+ version = "1.13.10";
# fetching a .deb because there's no easy way to package this Electron app
src = fetchurl {
url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
- sha256 = "058pl54mkbvcjyjmdz81r0ibk1qkc3798pkkdw1kp2cbg16qkfyh";
+ sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p";
};
buildInputs = [
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index e03dd65b9eb3..15cd426f1b3f 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,26 +1,21 @@
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
stdenv.mkDerivation rec {
- name = "qtpass-${version}";
- version = "1.2.1";
+ pname = "qtpass";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
- sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
+ sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
};
- patches = [ ./hidpi.patch ];
-
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeWrapper qmake ];
- postPatch = ''
- substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
- substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
- '';
+ enableParallelBuilding = true;
postInstall = ''
install -D qtpass.desktop $out/share/applications/qtpass.desktop
diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch
deleted file mode 100644
index 629bcbb5baca..000000000000
--- a/pkgs/applications/misc/qtpass/hidpi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/main/main.cpp b/main/main.cpp
-index 8a18409c..1cddd911 100644
---- a/main/main.cpp
-+++ b/main/main.cpp
-@@ -35,7 +35,7 @@
- * @return
- */
- int main(int argc, char *argv[]) {
-- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
-+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- QString text = "";
- for (int i = 1; i < argc; ++i) {
- if (i > 1)
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 483fb9cf95a0..1fc96e551ac7 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
stdenv.mkDerivation rec {
- name = "stupidterm-2018-09-25";
+ pname = "stupidterm";
+ version = "2019-03-26";
nativeBuildInputs = [ pkgconfig ];
@@ -10,17 +11,19 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "esmil";
repo = "stupidterm";
- rev = "d1bc020797330df83d427e361d3620e346a4e792";
- sha256 = "1yh2vhq3d0qbh0dh2h9yc7s9gkffgkb987vvwz2bdnvlskrjmmdj";
+ rev = "f824e41c2ca9016db73556c5d2f5a2861e235c8e";
+ sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp";
};
makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
installPhase = ''
- mkdir -p $out/bin $out/share/applications $out/share/stupidterm
- cp stupidterm $out/bin
- substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop
- substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini
+ install -D stupidterm $out/bin/stupidterm
+ install -D -m 644 stupidterm.desktop $out/share/applications/stupidterm.desktop
+ install -D -m 644 stupidterm.ini $out/share/stupidterm/stupidterm.ini
+
+ substituteInPlace $out/share/applications/stupidterm.desktop \
+ --replace "Exec=st" "Exec=$out/bin/stupidterm"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/stupidterm/stupidterm.desktop b/pkgs/applications/misc/stupidterm/stupidterm.desktop
deleted file mode 100644
index c26d46060183..000000000000
--- a/pkgs/applications/misc/stupidterm/stupidterm.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=20170315
-Name=stupidterm
-Comment=VTE based terminal emulator
-Exec=stupidterm
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 825b52cda7f8..293f6aaa3c6f 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -74,15 +74,15 @@ let
in rec {
application = mkSweetHome3D rec {
- version = "6.0";
+ version = "6.1.2";
module = "SweetHome3D";
name = stdenv.lib.toLower module + "-application-" + version;
description = "Design and visualize your future home";
license = stdenv.lib.licenses.gpl2Plus;
src = fetchsvn {
url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/";
- sha256 = "1l4kc1c2iwkggmcdb2wksb4vrh97ll804vc51yawhdlq9g567ky9";
- rev = "6647";
+ sha256 = "14svi112kml175dblzcdjzhlfwbp1cy6rki49mqb3632hwmif6ya";
+ rev = "6750";
};
desktopName = "Sweet Home 3D";
icons = {
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 4a6ad4e5ea38..80dffe6d93f2 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -12,7 +12,9 @@ python2.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ];
- buildInputs = [ gtk3 vte libnotify keybinder3 ];
+ buildInputs = [ gtk3 vte libnotify keybinder3
+ gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
+ ];
propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ];
postPatch = ''
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index ab6ef3294700..ed9ae5ade9ff 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,19 +4,20 @@
stdenv.mkDerivation rec {
pname = "tilix";
- version = "1.8.9";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = version;
- sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d";
+ sha256 = "1k8hqpq6bzmn06b4s8c257n37ghgp3fl7l9g6fy0giwk1x0ix735";
};
nativeBuildInputs = [
autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils
wrapGAppsHook
];
+
buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ];
preBuild = ''
@@ -34,7 +35,10 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \
--replace "Exec=tilix" "Exec=$out/bin/tilix"
- sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop
+
+ # TODO: Won't be needed after the switch to Meson
+ substituteInPlace $out/share/dbus-1/services/com.gexperts.Tilix.service \
+ --replace "/usr/bin/tilix" "$out/bin/tilix"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 127d9f21d998..6079c8807dc1 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
- version = "0.20.0";
+ version = "0.21.0";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "${version}";
- sha256 = "0s5i6fjip5kvvyb59yndi2rhgn962lr0g9b0pi5w2aqnv1mwjbfh";
+ sha256 = "03s81i9rz7dn33r13p7j2c7yw874hkm64x7myddiqw9lc21fyzql";
};
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with python3Packages;
- [ requests beautifulsoup4 future ];
+ [ requests beautifulsoup4 future wcwidth ];
checkPhase = ''
py.test
diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index dcc77604e6ea..ab1e0b5dda26 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -3,17 +3,18 @@
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? false, libpulseaudio
, nlSupport ? true, libnl
+, udevSupport ? true, udev
, swaySupport ? true, sway
}:
stdenv.mkDerivation rec {
name = "waybar-${version}";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
- sha256 = "0vkx1b6bgr75wkx89ppxhg4103vl2g0sky22npmfkvbkpgh8dj38";
+ sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g";
};
nativeBuildInputs = [
@@ -25,19 +26,21 @@
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional nlSupport libnl
+ ++ optional udevSupport udev
++ optional swaySupport sway;
mesonFlags = [
"-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }"
"-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }"
"-Dlibnl=${ if nlSupport then "enabled" else "disabled" }"
+ "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }"
"-Dout=${placeholder "out"}"
];
meta = with stdenv.lib; {
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
- maintainers = [ maintainers.FlorianFranzen ];
+ maintainers = with maintainers; [ FlorianFranzen minijackson ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 22ababbca3be..ff0555eb9657 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "xmrig-${version}";
- version = "2.13.1";
+ version = "2.14.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160";
+ sha256 = "0pc3ssmnn36xs3jgznx36q4z3qh06fkbz8md3p3rk6rpvly929pn";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 2df0cdafdc4b..6040b60707a2 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}";
- version = "2.11.0";
+ version = "2.14.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
- sha256 = "1jjcgnpkxdafsdsxndsvzd84i6mwk7ix4vvgs3k1dla9ll9nwq5j";
+ sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index d4afe4ea9e14..6fc7de1d4d57 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }:
rustPlatform.buildRustPackage rec {
- name = "zola-${version}";
- version = "0.5.1";
+ pname = "zola";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "getzola";
- repo = "zola";
+ repo = pname;
rev = "v${version}";
- sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9";
+ sha256 = "11y5gb6lx040ax4b16fr3whkj4vmv8hlkvb50h58gs77payglf6l";
};
- cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752";
+ cargoSha256 = "19hqkj27dbsy4pi0i8mjjlhi4351yifvc6zln6scc2nd60p251h6";
- nativeBuildInputs = [ cmake pkgconfig openssl ];
- buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
postInstall = ''
install -D -m 444 completions/zola.bash \
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
new file mode 100644
index 000000000000..b86cb7d3dd92
--- /dev/null
+++ b/pkgs/applications/networking/brig/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "brig-${version}";
+ version = "0.3.0";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/sahib/brig";
+ subPackages = ["."];
+
+ src = fetchFromGitHub {
+ owner = "sahib";
+ repo = "brig";
+ inherit rev;
+ sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy";
+ };
+
+ meta = with stdenv.lib; {
+ description = "File synchronization on top of ipfs with git like interface and FUSE filesystem";
+ homepage = https://github.com/sahib/brig;
+ license = licenses.agpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ offline ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 36576df4b732..49426a8af3b2 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -20,10 +20,12 @@
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
+, libva ? null # useVaapi
# package customization
, enableNaCl ? false
, enableWideVine ? false
+, useVaapi ? false
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true
@@ -126,6 +128,7 @@ let
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
+ ++ optional useVaapi libva
++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "72") jdk.jre;
@@ -143,6 +146,9 @@ let
# - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
#
# ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
+ ] ++ optionals (useVaapi) [
+ # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
+ ./patches/chromium-vaapi.patch
] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [
( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" )
] ++ optional stdenv.isAarch64
@@ -260,6 +266,8 @@ let
proprietary_codecs = true;
enable_hangout_services_extension = true;
ffmpeg_branding = "Chrome";
+ } // optionalAttrs useVaapi {
+ use_vaapi = true;
} // optionalAttrs pulseSupport {
use_pulseaudio = true;
link_pulseaudio = true;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 4b9a747811f8..68aee1f98d76 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,6 +1,7 @@
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
+, libva ? null
# package customization
, channel ? "stable"
@@ -10,6 +11,7 @@
, proprietaryCodecs ? true
, enablePepperFlash ? false
, enableWideVine ? false
+, useVaapi ? false # test video on radeon, before enabling this
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? ""
@@ -32,6 +34,7 @@ in let
mkChromiumDerivation = callPackage ./common.nix {
inherit enableNaCl gnomeSupport gnome
gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
+ useVaapi
enableWideVine;
};
@@ -92,6 +95,10 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromium.browser}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
+ libPath = stdenv.lib.makeLibraryPath ([]
+ ++ stdenv.lib.optional useVaapi libva
+ );
+
in with stdenv.lib; ''
mkdir -p "$out/bin"
@@ -109,6 +116,8 @@ in stdenv.mkDerivation {
export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
fi
+ export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:${libPath}"
+
# libredirect causes chromium to deadlock on startup
export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
new file mode 100644
index 000000000000..38d77e215516
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
@@ -0,0 +1,117 @@
+From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas
+Date: Thu, 24 Jan 2019 12:45:29 +0530
+Subject: [PATCH] Enable mojo with VDA2 on Linux
+
+---
+ chrome/browser/about_flags.cc | 8 ++++----
+ chrome/browser/flag_descriptions.cc | 9 +++++++--
+ chrome/browser/flag_descriptions.h | 10 ++++++++--
+ gpu/config/software_rendering_list.json | 3 ++-
+ media/media_options.gni | 9 ++++++---
+ media/mojo/services/gpu_mojo_media_client.cc | 4 ++--
+ 6 files changed, 29 insertions(+), 14 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index 0a84c6ac1..be2aa1d8b 100644
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = {
+ "disable-accelerated-video-decode",
+ flag_descriptions::kAcceleratedVideoDecodeName,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+ },
+ #if defined(OS_WIN)
+@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
+ #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // ENABLE_VR
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ {"disable-accelerated-mjpeg-decode",
+ flag_descriptions::kAcceleratedMjpegDecodeName,
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+-#endif // OS_CHROMEOS
++#endif // OS_CHROMEOS // OS_LINUX
+ {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
+ flag_descriptions::kV8CacheOptionsDescription, kOsAll,
+ MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+index 62637e092..86f89fc6e 100644
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -3085,15 +3085,20 @@ const char kTextSuggestionsTouchBarDescription[] =
+
+ #endif
+
+-// Chrome OS -------------------------------------------------------------------
++// Chrome OS Linux-------------------------------------------------------------------
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
+ const char kAcceleratedMjpegDecodeName[] =
+ "Hardware-accelerated mjpeg decode for captured frame";
+ const char kAcceleratedMjpegDecodeDescription[] =
+ "Enable hardware-accelerated mjpeg decode for captured frame where "
+ "available.";
++#endif
++
++// Chrome OS --------------------------------------------------
++
++#if defined(OS_CHROMEOS)
+
+ const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
+ const char kAllowTouchpadThreeFingerClickDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+index 5dac660bb..6cc4115da 100644
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -1846,13 +1846,19 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+
+ #endif // defined(OS_MACOSX)
+
+-// Chrome OS ------------------------------------------------------------------
++// Chrome OS and Linux ------------------------------------------------------------------
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
+ extern const char kAcceleratedMjpegDecodeName[];
+ extern const char kAcceleratedMjpegDecodeDescription[];
+
++#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++
++// Chrome OS ------------------------------------------------------------------------
++
++#if defined(OS_CHROMEOS)
++
+ extern const char kAllowTouchpadThreeFingerClickName[];
+ extern const char kAllowTouchpadThreeFingerClickDescription[];
+
+diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
+index 65f37b3f1..ae8a1718f 100644
+--- a/gpu/config/software_rendering_list.json
++++ b/gpu/config/software_rendering_list.json
+@@ -371,11 +371,12 @@
+ },
+ {
+ "id": 48,
+- "description": "Accelerated video decode is unavailable on Linux",
++ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
+ "cr_bugs": [137247],
+ "os": {
+ "type": "linux"
+ },
++ "vendor_id": "0x10de",
+ "features": [
+ "accelerated_video_decode"
+ ]
+--
+2.20.1
+
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 277ad29abe29..2334dc6a71e4 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -97,13 +97,13 @@ in rec {
builtins.tryEval (builtins.fetchurl url)
- ... except that tryEval on fetchurl isn't working and doesn't catch errors
- for fetchurl, so we go for a different approach.
+ ... except that tryEval on fetchurl isn't working and doesn't catch
+ errors for fetchurl, so we go for a different approach.
We only have fixed-output derivations that can have networking access, so
- we abuse MD5 and its weaknesses to forge a fixed-output derivation which
+ we abuse SHA1 and its weaknesses to forge a fixed-output derivation which
is not so fixed, because it emits different contents that have the same
- MD5 hash.
+ SHA1 hash.
Using this method, we can distinguish whether the URL is available or
whether it's not based on the actual content.
@@ -111,25 +111,50 @@ in rec {
So let's use tryEval as soon as it's working with fetchurl in Nix.
*/
tryFetch = url: let
- mkBin = b: runCommand "binary-blurb" { inherit b; } ''
- h="$(echo "$b" | sed -e ':r;N;$!br;s/[^ \n][^ \n]/\\x&/g;s/[ \n]//g')"
- echo -ne "$h" > "$out"
- '';
-
- # Both MD5 hash collision examples are from:
- # https://en.wikipedia.org/wiki/MD5#Collision_vulnerabilities
- hashCollTrue = mkBin ''
- d131dd02c5e6eec4 693d9a0698aff95c 2fcab58712467eab 4004583eb8fb7f89
- 55ad340609f4b302 83e488832571415a 085125e8f7cdc99f d91dbdf280373c5b
- d8823e3156348f5b ae6dacd436c919c6 dd53e2b487da03fd 02396306d248cda0
- e99f33420f577ee8 ce54b67080a80d1e c69821bcb6a88393 96f9652b6ff72a70
- '';
-
- hashCollFalse = mkBin ''
- d131dd02c5e6eec4 693d9a0698aff95c 2fcab50712467eab 4004583eb8fb7f89
- 55ad340609f4b302 83e4888325f1415a 085125e8f7cdc99f d91dbd7280373c5b
- d8823e3156348f5b ae6dacd436c919c6 dd53e23487da03fd 02396306d248cda0
- e99f33420f577ee8 ce54b67080280d1e c69821bcb6a88393 96f965ab6ff72a70
+ # SHA1 hash collisions from https://shattered.io/static/shattered.pdf:
+ collisions = runCommand "sha1-collisions" {
+ outputs = [ "out" "good" "bad" ];
+ base64 = ''
+ QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4
+ Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0
+ MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk
+ 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN
+ GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp
+ o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ
+ qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH
+ MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B
+ mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0
+ S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC
+ Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc
+ upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu
+ renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ
+ yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL
+ StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8
+ wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE
+ JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW
+ lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU
+ pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6
+ rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE
+ sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P
+ i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl
+ 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen
+ r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ
+ YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw
+ l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM
+ sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp
+ V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh
+ t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt
+ Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1
+ i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p
+ y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW
+ 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k
+ NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA==
+ '';
+ } ''
+ echo "$base64" | base64 -d | tar xj
+ mv good.pdf "$good"
+ mv bad.pdf "$bad"
+ touch "$out"
'';
cacheVal = let
@@ -137,31 +162,40 @@ in rec {
timeSlice = builtins.currentTime / 600;
in "${urlHash}-${toString timeSlice}";
- successBin = stdenv.mkDerivation {
- name = "tryfetch-${cacheVal}";
- inherit url;
-
- outputHash = "79054025255fb1a26e4bc422aef54eb4";
- outputHashMode = "flat";
- outputHashAlgo = "md5";
-
- nativeBuildInputs = [ curl ];
- preferLocalBuild = true;
-
- buildCommand = ''
- if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \
- curl -s -L -f -I "$url" > /dev/null; then
- cat "${hashCollTrue}" > "$out"
- else
- cat "${hashCollFalse}" > "$out"
- fi
- '';
-
- impureEnvVars = lib.fetchers.proxyImpureEnvVars;
- };
-
in {
- success = builtins.readFile successBin == builtins.readFile hashCollTrue;
+ success = import (runCommand "check-success" {
+ result = stdenv.mkDerivation {
+ name = "tryfetch-${cacheVal}";
+ inherit url;
+
+ outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a";
+ outputHashMode = "flat";
+ outputHashAlgo = "sha1";
+
+ nativeBuildInputs = [ curl ];
+ preferLocalBuild = true;
+
+ inherit (collisions) good bad;
+
+ buildCommand = ''
+ if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \
+ curl -s -L -f -I "$url" > /dev/null; then
+ cp "$good" "$out"
+ else
+ cp "$bad" "$out"
+ fi
+ '';
+
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+ };
+ inherit (collisions) good;
+ } ''
+ if cmp -s "$result" "$good"; then
+ echo true > "$out"
+ else
+ echo false > "$out"
+ fi
+ '');
value = builtins.fetchurl url;
};
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 5b3e8d727d0c..e067f3f15eb5 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "eolie";
- version = "0.9.45";
+ version = "0.9.60";
format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "0x6f2qqqxpjf28mqxs4jlrz2z8wa9nvb9h24nf8qwmzavjjbraqg";
+ sha256 = "1mhl7p8pwp8lqx5z15r0lx1y4mb2c1gjwy3w6041cyc4hyb91693";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index ff16ddb90f69..c721a61591a1 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
name = "falkon-${version}";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "falkon";
rev = "v${version}";
- sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41";
+ sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7";
};
preConfigure = ''
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index dbad2012e8ca..ca295183e221 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 = "67.0b3";
+ version = "67.0b7";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ach/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ach/firefox-67.0b7.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "11f2b3d99e303f747c565fa2a28ca8dbc6eada8c13ccdc931a99e060621078615519a29dd7dcb5636f2744a5ceb52ee738925a6cd2b81b6ac8573d5e0e048053";
+ sha512 = "4f640887e38c4c6fd30f8c6bb3d296336a73c9c039c9ebcd0b26080528d5ee2f9ae3e041d107d4dfb2fdc9fbbe50669e8f4332adb02f01e700b24afeb918b0c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/af/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/af/firefox-67.0b7.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "4eb18c3f12f793c5d6f6895c900d8263a0f2ecce8c77aa2a9ae6404297ab3d29c7e544e823b13328bf8ef460a676d71c05b3f81f14b63f649377a3246241f058";
+ sha512 = "75e2d8b31e3a4cfa43893d22d3d6cb274834daebfcc1ac27a7e77cf5404f5ac521362e9b57de7977c9117a6a5d4e1a975403c55d7bd61d5e06aae9d2957bfeba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/an/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/an/firefox-67.0b7.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "780cb363915cfe5e7707336523f9a3291ade23d904637d76fa54fc2708a7ff4a4f83e05b00c0c173343d5d849aab52f25baedfe87d6f351cb1398ea24e488269";
+ sha512 = "4018b692d2bad85bb7e2d90416f6ff1b3a61bcb2d352b8d3a6b9771348434b624f923185015bd3bb32786fa83f8ce184a3464a91a80e17dc94113805fdf386ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ar/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ar/firefox-67.0b7.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "1dbc639e81bda848471552f635ed76d415e4c56a7cf3aec48052c85b36b74f510f9ac990a14632f15c67402ef2f3a44bdd0cc8efe6c2bfba153d44640c254b19";
+ sha512 = "9459917b266241cde076463d100d29bfda4f2da401d261fb2baa87fddffe86a983a5f873983aab5db8a16704d36850608a670da12d9fb93792bdeda7864bdded";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/as/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/as/firefox-67.0b7.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "d9b47091bf60252ed7c1d70a8da2fca29b47a2892f82c7f9140b07ca82ed0701065d1b092eaa917d70a3a0abf0f9aafbd47ea1281afd37b31444418127d2b78b";
+ sha512 = "78cfd264f164400e76bf1a2935daa97c1e43b65bf057eb1287de07e148238205dfb72c3412437ad42948b9e9d47bc2a2c2f2360ac9255b2f834cc1a62c282678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ast/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ast/firefox-67.0b7.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "9316ecf3c7b2b94a6e3d5dae3cf9369146392aa7b2f8ddffadd4553afbec3e1060ff96abf3703b843f071c1875bb52bf41ceb5bf94725096e1b9ccebb310ae93";
+ sha512 = "ec2ab27cbf93854c995d3d2fafcbd3e121224aac344a058e6c8113a3fedf62650037054967987fde6d035013366f7c5ebd4b179ab37b7c8a8a2fe95490cf80ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/az/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/az/firefox-67.0b7.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "dd3212e4f5486b0aadbbd2cf453fac155c6c19d17d4a83575d77e93de44986c2b73c825d78efdc69542cc3f5ee66c251460236383ae74db2264b3010884ff013";
+ sha512 = "a86a3475738ad39c05db2ec9084032c7b3141882348870ab29e0940a1da0098e548175257d2b656332c23ae0db224a9f12d0c630985c25c0a0ff8d84d00db6df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/be/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/be/firefox-67.0b7.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "063c3a6c7c8ad97afe20889425b1dcb64167ed291cf30c139efbe8d82b93af4467b6d1661c849bbb5da5fc49fa37602cc106f4a1d398f7cc12251c4aec7d73bc";
+ sha512 = "5d997969f984fb9e9bf5dfbf64b66bf604abab0a4c1d2e53b82990197dd233b7605f3ae294053428a0f8509f0c640771b203d865e2e655fdb9449bdfa9454a97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/bg/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bg/firefox-67.0b7.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "b706567418d5e1ddd123ac149c6a077bbc324961fd19c3c4bd430b7f6e57bd0ad1024746152bb924e7e2205d6bcdb5f017077ac078b9847eb36568ed1aa8d7da";
+ sha512 = "930794602f594588382b959ef54d4ff05cb8ba71d39ecc23934d29e8820bbad8204708392c28185fd97b2eff7cd1a93a7156736675ceb072c4b820cc78be6efe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/bn-BD/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bn-BD/firefox-67.0b7.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "501c08adf36e82af49a80cf915e2c701cca27c7f85deeac1e9802b48812c677e383ff32862810123f5d97ae207a85cd76eb4b0fe4b5b85c41d5d18bff43897ba";
+ sha512 = "f186acacbe502a620f8b2dbc1ed6fb3d978128af749b8f55efa122cff6ba3702c21361e47fd5a4af33b533a7961ccc13dcb0ed19e2617b244a87c82295f491a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/bn-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bn-IN/firefox-67.0b7.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "480a6a5cc80c94a49fcb0c4698d61cb3a842587d2d5d2dc0d725f32013a5e5ad7fac705ba029f6273243d301ede477f23f154aab813986a2d0815684bcb815ad";
+ sha512 = "fbc97c4a4fa81edeb8b6af71accae9155f7efab2e79a724a671a07adcfa5f0f252faac3a3ec63db452126aa0ac87b2943657e9d18094274ce72995f3f7ea3f35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/br/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/br/firefox-67.0b7.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "4254f6a1ee5d480879428aff82098c2696204196bf725b828f244eee3c8047b1bc2553a63c7bda6127589e3f8985128111d57db4ee46ff49ab58a20a2b67b163";
+ sha512 = "ded74968f5cb4b9794d1a200fcf378698c5d31bace8b0e39e1c6710d665b7152e77fd565cdd694b8e556857d9415dc6af912c5c44bd5c937baf52cacb33d399d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/bs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bs/firefox-67.0b7.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "a73a689bce631342bf9bf528aa03640468966252ebfd2e3337f487bd8f18013dbd1df863394042c68192a1794b5449aa57d6fb21aa87a261129079118291407b";
+ sha512 = "b98385274bc71ce17144adbb164e9d42fbac318ea953fd994468cf6066fa0dd5aced6d737da3be21f0e0bdcf30507ecf29f2865941df8b6a6334dcbd4394cfa0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ca/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ca/firefox-67.0b7.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "70a67de9946280b01d5588d2738b09dc2a7c47dcf0490147624b6bd5c0a814ff9a83b7536d74e48955189a76e2866c21779a4711d3f6c45510c1441b4aae7dd2";
+ sha512 = "497a623b9e39035337ca67bee7d04399f38eadba23ecb9c354ee848c969746655c693c3fbc00ad5e826ea0d5140dd0ac6ace029c35b56fe3cccf79c8612de68c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/cak/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cak/firefox-67.0b7.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "9a7035f053f90fbb95e38a6212de58a9d3d8e97844dd14e02dda2c0479709eec8d18da959f1df88846e9cb9e1145c7cc63afab57456a95e4ce658ee93906f97e";
+ sha512 = "55ed818b0b3acee7416615ddb606f0695f948fa633b44889e1881acd091ac514a57a8678d8830a91bc7097282a2df30396e3f27a0df225b7fb6de458cc5ff832";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/cs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cs/firefox-67.0b7.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "0860057519ebaecdc7e3b1c55990dfa81e18d86adc296bc9401da3954cb0b682573e0973fc12977ffe1b038ccca093a424a012dc18c9b5829c1a7da0b8e6515a";
+ sha512 = "a79c77cf3fad65437e20dc4f086778daac9bd403228ac0efbc1aa5b69216b6aaa91488f5691bd9cb9e27a44b7107342ff3cbe03be73a83a9f449eeb777afcfba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/cy/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cy/firefox-67.0b7.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "fa7a8a6c7dbfe4eb9483f44daa3a9b7b9088289d5ec96285223b976ee2302ea35fffa869242840680968154cb76249f9f1eb45ce5552d100ae0aec991383266b";
+ sha512 = "da13683201a46d15bb6f6c4ed871459a83894a8d883a743637a978ed202001dda2bf0812f02c193f178023a1229357b394d69e6e902cf76afb27f4929fc6829b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/da/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/da/firefox-67.0b7.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "f0f53e38090c3221ca8ad70d7b314bb81ca398bfaf9b1e959ed4a3c66a1e140b8a7f7406b0839352d89bc1b78bf873ef1b935946487c617cea860eb997555c44";
+ sha512 = "9694ffc20872aa9e033255a8c5f8c98b4dad2159aa3dc2bd841240b2c462b519831c5d938d3ba7470c738f3c587ed211367ca1f7a00e225a90744ca330d97e15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/de/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/de/firefox-67.0b7.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "289604681dd8b5bceb5b800b61c7530be2dee1bb0fe3b6e53c447893ac71140092fb230e1ce4204bc39249121bd66d132720bc9e8495b7e6c18c0357e44bb733";
+ sha512 = "0fc81d549c2636d2e58b8f4e9923e6d5d691a64bf2909107735eff9aee6bba0de4d967066fa6937f237939391c86ccca55ae03b8e55513600108bd86ed200899";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/dsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/dsb/firefox-67.0b7.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "ad631d282608b69809fd35ce42c84e92c9d548ac64960adcfbbe94ef90c677476c3c58a5368c9b3ae3280c2f9ac8209c41e6ce16fb58f1f06c5bb8c99fd54930";
+ sha512 = "ddff938d5a79e9253c6815846b9951d8b64618d5308d8fde620e21492cc4979bb56d88d716861661a50d01f0f020eb1cd6baeeff83436e584b94f80b3e93eb88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/el/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/el/firefox-67.0b7.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "da0cd4dfecc6780ba12f77ccb621e4a3e42d1e1d53b96a9abdac70668a5e9f41c97261b83874ad297d536721846f7d93b507d458bd79bcdeb78d37b329f9f7a3";
+ sha512 = "099ea9058e26600be8ea8a82cda49a3a76585cb6078bc221a653cc385022ff7991f8b9e02cb7caf7a6562bcc84c00cd7a69c01678d31fa1dc89f2c2659347de3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/en-CA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-CA/firefox-67.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "67b7c5c6a0a3e3be3642bc8277891270f9c4778305fad9a8db66578f183987abcd723b0418536010b3e9e49fd8989bea8f5762261d716a38fc347eeb22e0e4b8";
+ sha512 = "6ebb2c19ed3705834a29f64d79fe8d0cd4c8b5e17ee957e30e11f63399c887491e354a641df37743de9d3a9e4b864efe4b6a2481a029ed545f06932a49da26c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/en-GB/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-GB/firefox-67.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "b4ecf69359d231a695ec520dd8330ad64cc3d943b5f79bae5db15b8424548ba8f251f584839a1b40d8a6163ab9a49976ae738e093975852f6cd5551a09e38220";
+ sha512 = "924da12dcde359bb0576f14b75d2114808f495e98903762a960f508ce939b36f35a02f4858042b9be99305c4f505dc7e4427bbe5258c5315efb91c13e9125e3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/en-US/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-US/firefox-67.0b7.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "c8f1ecfa5c4893af77df2a1fa95d508276eb33cd4f2d8c137190a3c962d02e991b7702e71d84ea7248c6d30525e8c6254c1d854e1b3c62e98d5230684db5958a";
+ sha512 = "d85347fc794383b2c9ce848ec064010e3255cbf471187952d4adaa2f3ae461befd8515b95601a5d7c6c86281c956601408829bb161dbcc6c259686e73eaa7773";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/en-ZA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-ZA/firefox-67.0b7.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "63001f411e4596814ed381de5c49f3981baf4d3ed5ac230a1b57a3aa84967bf4d4f287fedb029a6c3f9ae2a0fe7c1523370f68077d9a69e1a7cdc9956ef813bd";
+ sha512 = "6c843b8069e7f375d42ffdf7898a1331a9f847676dd0e13f6cec0701ae4ce8c70b415da314889781208d49696af4e291b078bce0d64721010fb269cdbd321bc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/eo/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/eo/firefox-67.0b7.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "69e64203e63006dd2282c435defa7540f2ca898e5368b3e7ba8da328820d54c4f7d31b7393e181dccf1fac1762b225b0934f01f57c27a55c436e9ebd5b81e6fb";
+ sha512 = "dd6e0d4d343c479cdcdcaba4947994c45618116f6943f0e9b0c2654de6bb1ab849a99679bd2a5a646ea0f6e0bc7b392f67de2766701bf9151c99d59bec5e2ba3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/es-AR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-AR/firefox-67.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "717cb900acb1c12193d82ebbad209b02cf37295391e4182cb0c8a77f75b3b1ef49b1c75bb2e25c74d3c78d83747a3a96efae2b4b722f59ce527308002ad61624";
+ sha512 = "4defc2bd2a7831081ac70b29915087e94eed6659dcb23e961b7200cc6b89feda2c0442fc969fcfee57c537ad487fce6edebca2ac62f356b3c387e1a7d1790d93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/es-CL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-CL/firefox-67.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "34287fb3c29e998674e2358d7c9fd89e27a58d34f56c3836ae2703709e4df27bf61b9b71c6fba790350e11efde7aaf39bc2ac7ac22f54c9a2d4c539dd234a6ff";
+ sha512 = "c0494964c5bf6d0938dbd78d5b801e000fa6c850d95f629a375e8ea69d58fb7bce8cc38d32b456fb8341230b13eb4eb34b31b59e46b32941281a6283e9d52e7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/es-ES/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-ES/firefox-67.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "ad97a4fa1eef87928957f562739aeb915b718e54b394abc14a1c30e39834f5837d5bdadf13b56748a18aa5f57565010c1b2653c68820972f4d8e11a6807825db";
+ sha512 = "a4a7f4fd7552ef57c3fec732cf48f6d442ce34cdccf6cd01f713b1468522d33d61c3307b6919df4ea38ba4ab2b1a237147586dbe4052e7084f03ae0f71848389";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/es-MX/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-MX/firefox-67.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "637dfd7723a517482b231a2c14101b31a9ce9780478dcaf11233a68e4d04bc59b8fe4bdee1bdbd38e1cfcb44fe75286856aeef12901a67b0cb09b2a1ae0857a2";
+ sha512 = "6de76564a94bd0a61834ca2957ff4e969551d7fe74716d80975c5249f85aeaeb7e0f40d0ed8a5653a237eabaa527de234192b97df1525043148c2eb3246799ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/et/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/et/firefox-67.0b7.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "155e384bd34b2546d33da1f14ddf925cd27ffbabda0c67bed22f1c1f5848fdbfcb588b06c422d445806665bde0acda6b7de14a4c4b1fcecd5f2b7aa26a0a51cb";
+ sha512 = "3406361c8358703e6166bfe19cf690a3b03083e043d9215a88ee9cf923f82064217232622da0286b44b0cd3f9b6ce570e73f06b2f8558096d2c0f97089fbc691";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/eu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/eu/firefox-67.0b7.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "aa85d76255ec15a7e3c428d9e7068c14b6bcd51785f86221b0e84dc757cf645808db5d20c7891fc4397b1368cf7ca372eed41ed5cb7d54f9a2045a512450ff7e";
+ sha512 = "e1e3858a11982c22aa2d592343365db0fdf4acf5ae5d366e9f862d550a0e90e383182d6e20a1e85b5af62746f3750ab97269037973575edc8eb2f7e12e8231da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/fa/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fa/firefox-67.0b7.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "7328dd170e9ba00da4371d0b1246b1aa165feae07de5a36e229273d871594434f8ded34a2ad999dc79e3b03a6a91810b0e1f83f32e00c5f8313381a1f520d088";
+ sha512 = "e4171bc5e5bfd699eb0a99fc7f7f3783fbbd8c888d506e7cd76bffd1c053056713729c41990cb6cb4433c1f9f964bf00449e682fa953995a21ba2b41e781ed01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ff/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ff/firefox-67.0b7.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "4ac68dc528688dcd5ada985c64ff872e11e4af1d0e87b74f23687ec09300633916b83f093cf82f197364dfa34af07a7195816773662e7cfaeea2fdf0ade6aa12";
+ sha512 = "c7dd25f2dd80913eb688ed7eb3e485f3f320e3fedc71bd65ed54b63c48952de065110d084db3e32bb22c9bb315f353280d5a9f396f025464d0b6114f1ce3c4fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/fi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fi/firefox-67.0b7.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "b19014b5ea7b9851351ce3c3dcfad9b7982abee865f08de5d84a8f1b3122346e4ad41c27aa644f7bed2daec6b406d4a24a1b740b21e18efc5acb48786043c948";
+ sha512 = "d8303e66241a4371717ca390a295c16140f6917e8f013e4bcf2e4f21127544ee12989d8e1befe5b907b7bea51ae6b20922b1f68dd645c0677c2c68ce0bc90295";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/fr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fr/firefox-67.0b7.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "4ad62eae404ce084199b7d91664fabdd2d2599b5583f45381ff2b43ebdc4b4b64023d9df268a8fdcc4240e2448af8e398c3a10fca3af8a7134ede3524a42b08b";
+ sha512 = "a5454f58aa2f5f04e730504d17500d8e5edba8e3f9828d4e9aa07eed872d7f25e8156a337fe384ae523e51a74f86d6e8b306e1184fd8fd8cca71bc6dc5423d06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/fy-NL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fy-NL/firefox-67.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "f0ef305457177803e9607d297bc92403cbe21ee8c0ff4e5e3f2518ca0c810bea260703f92d1ac0b774c24e1f4cee6860aafc42b4e451aca85b76ea504aec77f0";
+ sha512 = "83bbe2d56ff8a6ba2b2bdc5550c0d0621bc2f938b2977feb23627be0c38b9f43ed1eec4eb96ca875441fce5d5e0a00bb8ae3c5f6630ad93cf3e4683baf2d7090";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ga-IE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ga-IE/firefox-67.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "9d64557f167e860b51487829fbb3c5f6e1cc569accf1169ab8f962c67b2a9c14e32e3ca2ffebe8e8653d71a8178aef7056a4b8780a6d5f2c892f946e89cdb0c5";
+ sha512 = "9be4bd1576733024fb7374e9b343c200c6a2ada0961ee12b3217413407564d61749707613b5542c5a20d47ec4c9b505aac86a6587f70213e78df5f77cac3c2e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/gd/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gd/firefox-67.0b7.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "7a6761e28ac26e5e057c90d0e70e050f7b1b7ab573e1f14f59ec24aa944a21292fbf79e7ae7ef523a831bde8faf14c6823900aab8f69ac2074ac4ef4dc484847";
+ sha512 = "77ec579a29ae1ff35565311b38a4f09f0bc37aef54d0287a93dbf757ccef8beaa2cfd736a319b73bdfc6f48f942c9e885a8302a70a9a7844955e8147cd9afb4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/gl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gl/firefox-67.0b7.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "47d38310cceb0e4048587019a5326af60fd74bad420290a264c231a0982620dac86a44264cc075e12b6bdfcaa9142ed406b75d1a2ee2842515dc6bf2aea65da7";
+ sha512 = "2e047ae403ac4d043b063387c02fd17e47ead72737caaaa93a04b326b500c1e25b4f3a7d6ae2127b628dff86b31e49f0e500b3685bd945fb223598a584116dfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/gn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gn/firefox-67.0b7.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "9f00bb1aaf2d659817226bf2279def1305e6bcc59913939a1ed75513734d08f8d1ffff3477c0237fea248fdaba8dc684e91105e7b1b9f307aa15686a58c22d5a";
+ sha512 = "6372fc7499b7a1ee418d267c73ae05f68e03307a647fa90d5f66e3d3fa80bacbaef78b276446855bf3aa5b7979072c69fcfa5f7a07d91bc56f39493c549c3bfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/gu-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gu-IN/firefox-67.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "bcdda5c4fa8b56996a3d7d3c8fe49a74747292b9105dd4ef3250407185e7dfcfeeac044c92c40632b770c92b6adc6a3baddd69de955550b7d000eac376cb5ece";
+ sha512 = "5bda58c9d0f14ab1484f8821cc7231186ac11eb610f021df398120d38ed4b0bfd7c2c3b8bacad75f2b35e8ee8d34f95cb56e816c4db8f2f79acca5ec76e02a18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/he/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/he/firefox-67.0b7.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "3c393930310aa008927eb8029a27df38abd94d4efe5dc962c4cc88d608f8de16084441c346bf4a0d0f7a9d58d45acb39106b889211e556b1ae33bef613bf98c0";
+ sha512 = "558b5f326e87df3c668458488a6fc6261cc84915d9bf90451c8a426fb973b048279f1e0d2755e4c9bc081df52351e8b70dabf5a8113e07b9fd7e9bfdcc8914fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/hi-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hi-IN/firefox-67.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "1aef06d19d5df0185159327d50f3da92c911a15ba1a63217638e3502857c1e870bc8d66ea8561f7eede11f2fb88babf46b61f7f4702b409862923db250136045";
+ sha512 = "30abd8a9ab1c410f3293c4d70895b98cd0921d95ef8b986f30ffdc0cc273d7b10dd038ffae2658ae209f8625ee4493b467e4cc4b737fbc4a1a1f8ff5341843a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/hr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hr/firefox-67.0b7.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "ad916962a974f350121c8a1fe10e60909f3631198ca345bf1b3481a4271fe113fab39d163446ed2f7cacf2fe80e24ce0d21dd65904310e6b4419742104786b4a";
+ sha512 = "052277cdecbda15e260ad9cfbc9ce4e4efaf0391f301cc4870ccdb37320a9829284c41cdf09f908aac13fd745437d8b08bc4d5665aadb72e9af8cd648514271e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/hsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hsb/firefox-67.0b7.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "d5ee859dbc8fd5414bf8e33ec5ec0231f7c5136b3d94c41ed5064ee43aff4bd4b0264181c45f5c2435a908f85e81563a93956cba351f845d598bc218123a54ad";
+ sha512 = "d3641686918b38a41eeb3d20d583f4d2a7ae31e40a3c5dcb74acb268eeb5d6a37eee86fe7262277649ebb406d2ff7ed35e20fc8e261a0f7ec230f08b8440f629";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/hu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hu/firefox-67.0b7.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "d0fa06ff806cf1ece5d0fd53a882c276c7aa17671b4f03cbc46ceaed9f2ce8ee810116d34a2e5671f0cf0009ffa3f720472a9e74c23f51ec5df4380b1ac0ade3";
+ sha512 = "6b986fbbe8722aa8fe50e0f5bad42d75d7ea11bfec33ff3cae417bb98bda64994e6f7ddadf2e7645d8d2b313908221f68cb1be91957b2542f35355750b408e81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/hy-AM/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hy-AM/firefox-67.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "ce7765e5bfb9a0e3f28b91a6f034027a3b66974bfc25e30e9a78c77778ca5e64f3da4e461bb1746350a870a11c81cc144d9b8b8254fa8abfb134429db7676f1f";
+ sha512 = "4f49a55aa4a3f84c3d4d0d21cb59b42d27530baf8df8697b7baf2b3e2bcbd07a80f94ba462d63caab57ffdbcc2bceec6598778e942be353953de28c912ffced5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ia/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ia/firefox-67.0b7.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "9063edfd6bbb8b8b511d757bdff3f16b6533a3112cb5880d5bbb78b026007069c976b4c6b4deba8ee1e6d5b8addc0a0cac5ff8ee0e341cfef2631d4654e1fd07";
+ sha512 = "66cd918c709013c519210cfd7d9e0e7f4f8124de1c39b0f101076d8e75e30e593efa0401c145dcf1591ef86ee78713b83fa32429c9ea3fe2c4190a0ee88bff73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/id/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/id/firefox-67.0b7.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "7581c34d656ada027adabb6be533c3c820220ffa5636b6e703cbc8b90869982140f034a4032d9d65637b82b04819192e2b082866a1d1d8fcca650fa52a270b7b";
+ sha512 = "93dac59182acde7c59e9e3c762a4e981652cda78e042849cd3bf5e5d7de4a3f435350c633384b0908ca53210d33974e19dd36d22977094914828f1bb8327b6d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/is/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/is/firefox-67.0b7.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1376d4256f025361afbf4578a9ac71ef231125ab10a7ca990841354d257187bde8f057a715f9b01c439e80c08e0576171190fa45c00c0365cc134ecd2786907d";
+ sha512 = "a1020a3f594bb43050120df62faf3fab7c03619b5432f4027eec368fb559f692b9eb25d4eb2f953617db5414a1ad24c7409c963950d03dd1df4d084b66764248";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/it/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/it/firefox-67.0b7.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "35fdd5845bd34fefdcfa186d212a2bea03e7fea16c457faba70ca70a7ae6ee0210d221671c91f123b09be0694feb59f3d006a435af0d1ec2b2f5c090d99c8f0b";
+ sha512 = "ccfeaead66f61caf73b7c37ced5c7dabe688e1b5994386ee44d740b9e1fde2956b697f638ee7eedb5761bf35a94d82530543f1588b88720e5c07c3d6e10f82bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ja/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ja/firefox-67.0b7.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "de3ba04d2509f2f2e08df218304bb661ab34dfb50e17f04d7782bc4f70dc2c8b3003476f6e886a94370796ab8bfb336509e719b5ec89adf7f00c4d43c08573a6";
+ sha512 = "e3048bcc92ce62fd5622cdfa96b75abdb35bbbc8e17411bcd7c1d8cf64de9e073989fe2b6f86bb1f56c4c6b398479f1f946a1cdcb563be9cdf1aae63e36e153a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ka/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ka/firefox-67.0b7.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "c8e57390daf39013ceab5e7d23dcd92337979ea72ee8a0d5c9353baeaec4483464406347e04b030a268a6029597a3a086352621fa049fb663690565e59b81ebe";
+ sha512 = "20a66af34848ebcfb266fe5dd8c7a8d663aa8aef543988a5b06e33e4ca8cd9636dac8cc8dd219471e49bb596013d42664fcef4c4e2588e36c4e40ebcba947fdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/kab/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kab/firefox-67.0b7.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "55c2a67360bd26397fd06a5ec310e954d41b4aff44dbdbc72f58195e41d590b3500000a7d58ab8cd2e3cc086ade45a57172a47dba226607005bfa1853bf4ed0d";
+ sha512 = "619787bcc7b1a0ca6daccf6e5a555be342c09d7fb6f55c2fea3ca340a1852faab87bfb2af9f6828dd51fb94cc3a799d577f5b0b3561b7039e8fc177ae1bb8df4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/kk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kk/firefox-67.0b7.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "64e6c297802516e90bbbe258a57b5b942ce866da33d99bd8fcaf4c96755cc9140bbcecf6de2cb8d355721b2bbde4a3c525f55ffc5550aca5289d13a88c8a5899";
+ sha512 = "74478792242cb29304c37c7aafcb17783da6c7d7ae75e4307f20640104bb4a9e232c709082d30747a66c4bda87fac4020f9672c99b6858b9b08765f9253b4b73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/km/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/km/firefox-67.0b7.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "974f57f62f18a02077aba767c3c79930d1bae1188b9592a61ddd611a518fb7809e24f33dd81fa1c9a8710659716cbb3da4eda36c62709cc151c9736ca066d886";
+ sha512 = "8c62ada471c71c98344ba08e83593e78c6de6a4f95016fe48e444bb4bb36c727475268ad58adda8212f37229cc1f785df78f3b843e8b55905c661bfdb2a3f334";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/kn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kn/firefox-67.0b7.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "021a9a71aa4827a3dc2d83aa952db6de963cd274eb59ff4a6ea9833b8ebe0098e9a0f53dd40662e5053bf8dd73224e3b51b375b5459602b3bda6d5a65d7c4239";
+ sha512 = "77f8b91894a9c94672f71375bc83692a40771beacffa66ae76624cac2633138280e9a0ca5bd1f9b91373a7c31e26ff7fcc1eb0cd148c8b881890ee374a9dbb67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ko/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ko/firefox-67.0b7.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "a4c8c66e44f24cb2708a7f7303068acb2b88a79fb7f80f829f400ad3baeda5a9d22d9b2763f1913595ceab9d4cdb454637e4a377b1e6c739bccc0049bbb3404e";
+ sha512 = "ba8129e14fedc719ee60dc382dccec57f6d6bbf010da46d7853d99cf60b2f8cb8f685f2551e8e32e052745de4cdef214f3fce1fad5ecc73e4eb81253f4ae72e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/lij/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lij/firefox-67.0b7.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "df21a7f5ba15c559f48261fc7c8a9bdd003d6d2f4499f236f2bb4a742f60316a4f4aa530b42ca127f63de65edb44396630b107ea7375be83b3e79ce83685e918";
+ sha512 = "c8f093d027bc7ad7b5cc92b4a756ff0fa216607a27e6bff28545d140a8d4730cdb32c4e222ef0998ce3ca3a20c2a11c83d66a88858fc9614dcb65b77926ab89a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/lt/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lt/firefox-67.0b7.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "e7460524641f4754b37e28c0d6c21ee1336c3774a4a0adb9d22ee7cdfd54077e932f4d8271872e55a1254f8a383e73f6e65a8349035adc13aee055b5b6056505";
+ sha512 = "51088c7053b8f0654202b508442f808c0d66498aa80f7bbaa92b4084115ef71f250afdbad1e5957e1c5798ec164f5d86c0d61e7a99dbfd2a1cf2df17f3ad3da9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/lv/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lv/firefox-67.0b7.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "4dcf1502fc75c0221432be889103530572321c1cdffad7aeacf43c9202d279f2f745e8eb69dda84a897f49f28cb6e8950f23c2da9517c99ef6cd5cbc6c3b4590";
+ sha512 = "7fce010fcade668aeda3a322376e3753f1bffb853559a76c573babd2cd553e032fccc0cc9a71ddb437b8aed87560ff1bdf3458e39d2d81bdc8bc916e8716e9fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/mai/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mai/firefox-67.0b7.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "59057f3c6a4c3d615702902fb33c4093786ea427de4584e3984da15fcc0698cc59d5277a458da808efd8052b048c456a96f7a0dcb2509e0de39e3f7bcf792ae7";
+ sha512 = "8b641a43ec2633ee07c065e33681f81dc36805b13f3221485d1fc4bdb1ffeee4df79d378d1f50720943679030662f89dae42e005a01ab9281aed090c994b0cc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/mk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mk/firefox-67.0b7.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "2268b3451c4f24189beaf9877b293e0fbc597d1ef3565078fa9981319b6d582a174409bb2b72e5e465af99796775785d3a6e224a84cfe9c7071412c457c62599";
+ sha512 = "2fa98f6d1f35419ae526f062f6742be138daa4715f501d49b5ee2bb7ef63edacee8283245fc2ab81d484b0625a39e58fccc2aa9e255f56f980d37bde86fa57ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ml/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ml/firefox-67.0b7.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "33c68a4067a850aaf045b6fd7d68e705e79db4729bfb34e480d104b70b8477f324210b048be1b77ca838f07c26c4c2d313f0fc0163996e6d74a1396c9c30b5f4";
+ sha512 = "cdda564dce2c6178f33fb79f26d007fb96b544de3c4d0b5fc67d689cdea1c5b99dceb91f3ab9922c00c725ca8b15eb555c7ec7c661981a2159f7ac1af78474d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/mr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mr/firefox-67.0b7.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "2df80867c2c3c5a96dca0ce251ed1e8f43a5b9a7346abff062908a202fdcf5d324101c0d533230d9e8cb4fea0ea9513b231a2b70b0a5394044a1b951191144ba";
+ sha512 = "264be2bd1a0e73a84485419bf80fe04b3ebfe60de588ae6b2b7130ef5867139f285fee577d8bd50b5b161a040ab7d90d3cfc37dc26cd5461d412c667302128b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ms/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ms/firefox-67.0b7.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "01ce0e34c613db9993617a27a94495dcd79766ba6490cbc234db5f65a582551d490580d223ed560c6b6e41994cd8245192782a7525f43c64cea6a046d64ef6a2";
+ sha512 = "b33d82fdb3c566060553986d796f5e3d405d748029efc814af8c412328522d52c5cfbcc52071c75db6453bc4097d7fad8c40ac897822ba7f3b1237c14735e81c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/my/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/my/firefox-67.0b7.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "d0363a51c6980fe0da29ba80675625becc1b0f8ca31f6435a9555336fb09777cbc97bd8028a1f0db8021c193f890c9ef6839380be45551fb94527cb44bf18288";
+ sha512 = "696a6e013b998b7525b06d6247ebcf658276eb23fbf82a6beed6264a8ed754df367242ad6b70e36e76f84c86116b8186819ece9c4db8964a531f225e84ccc9fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/nb-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nb-NO/firefox-67.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "654ae72206d1da43e51b5694499534d1bbe207f45cd5d95d59d12ee1561b03274fa41fc86ce33d8b72e65216a4aea8a0d782c9d0bd54958f9ce010b72dd436ce";
+ sha512 = "7871bb5bb005d8cda4bc8f37029fee266b303335791fef063dacd5b6146631ba50f7396ef7f2874bb90d21c738fe88f8ea470636e229914888a2d9b3f87af228";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ne-NP/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ne-NP/firefox-67.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "838721a064e26b82cbdcdfeec73dc69716f3c738222e7c4db3b35115d625119f3a7e989dd674e33e714f4031b041cc8d37cffce2a97227072fe2655e95ad5b63";
+ sha512 = "79b2f7d885b2e06a6a3b66cff07c2f5004494e54fb251631ccf774bc95bd1e006e77f0ebace97401a4137742b3f6664abe8e63ef31b3221ce70ef81a91544d93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/nl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nl/firefox-67.0b7.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "b8a162f90b2e55cab4eb0d6273d9bc8c2ab5169a55b494e9cba2e691f02de9f92d43b8408104db418955cafebfdb96abed79c749d353db48ef9f35cc9ebd92bc";
+ sha512 = "cb889ade72f02ed026d5363c4ce3858856c2c472b9116f89add41fcc54086deef0c95e16c5cb4dd984534e18167a48330738a2701beb07ab7a316e58fe9e71c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/nn-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nn-NO/firefox-67.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "162f5283bd3da23f7b91429feba5f56c567f8561304c4eeec720f4ad19990b9d9b1bd7002ac3231469d1b0ac0b31f591e6ba4cff89a6d809dd21eafb3a05b97d";
+ sha512 = "1969741dda5c2637f6b11eb0d15c3b49b425f440dc37a688d33292b1f4e5742de45c22df0f1097265e0b68b1769405a25f3338519e14284749dac1aedfb455ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/oc/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/oc/firefox-67.0b7.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "874802ef73bd58d451279b29621d7936dda1482a0d1ef32be52c2a5c03ef55a8158f85d5b501910a7bacee72389db48352cf783b014850952c554176d4bdac85";
+ sha512 = "ffe7886c6a79dfc496e9a60ccb939b9d3641152ec93036a13eb1e3939d1e497a030b4c0332868673b81fcaf7a1a84ce52ed7f2aa656aff9bcc18fc00bceeeee2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/or/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/or/firefox-67.0b7.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "1368e404e6fb0a899d75353f5426870ec4aa8fcbbec9044b15944fc935eb19ed87779f4d382a0947f08ecb10b54053efadbb4f0a0daa0c4ae942a71e6683ec03";
+ sha512 = "227875a863199d30d1a64432249cc9c2692edabec3bf04fccb747f10ba3e4874e1fe8d3ff7164c2d58ae4d49071672082a82b554aaa9da18f0e491dbf7886bf2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/pa-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pa-IN/firefox-67.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "3127de639d7cc1d406a2fa0cd689c75d76cde69c7703067c7d1bd7ccf49d593b45c022ed54ab3d5cc1134089b759f2e11ccd5061468f56a6eb0a87f6a36d5fd6";
+ sha512 = "127685a93f4ca5c073c480ba2f3ff84d5d5a063671e325feb8620255978121aaf391c4ab759a3ea013847d9e416420bb3a7ef74cd4087f6ff3a6bb16a97e219d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/pl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pl/firefox-67.0b7.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "1a2d2eaadd3cf85ce75405cd7d43708498234368bd22118b6bb93f5dceb0166ca56acb6e65963b01407832dd8c67deee7bb297e76d7dbf820826be9c7ebcb475";
+ sha512 = "f8166b5258ef763c91cbe5b917b12405d57dec0d905a35acf534ce6554fb43f08e8c86ee9db012464a11ffd76688c5b0c2b4343367ebf071d1e68aa3ce147891";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/pt-BR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pt-BR/firefox-67.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "6db512be623dfd52855f016782fa7d46794ced20d99a972fa6c6bf65f044425f54ee4f74aae153a6bf8fde7577d1e68a282678c88e3fba9fb9def986fb65a37e";
+ sha512 = "ba05cebc862fff1764a8cb2a2d3fcdf542c42e5ed453df7605733750318b8257754a20e9a3aef12e8740d647e7aaf7451e6507beb30abc6b87714d8307c0b777";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/pt-PT/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pt-PT/firefox-67.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "8e4125affc4ef4ced3f00260771a2c13056a7e61e491c6dd872557b911bbf95854df26c2fc1dff7eb0acfb8a08586d53419294f59d093f1a6c66950acc2e2999";
+ sha512 = "7d76b136ede93cdc4d06a9afc645ca74f06eb56d63be7914a696e6f9d1282eb9da5be72535e46a48007115d37334d5bc3a5b4ac954c486a5af8cf94e9bfe1352";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/rm/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/rm/firefox-67.0b7.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "0c065424ca45a4ab705ec4e4a34f62c0c7907d36d8d8ece0a3c83e4a1de2dd3b953e8732c848e50474ffd409b708ccd6860fea20261ac8aea54d001aa614f0f3";
+ sha512 = "83ea66dfa3c4674c7f58d18125ff0886d4526740c6c697ff049eb4953179904b868065a053c15ff72308c822513dc523e4706fbd0bfde30eda7fa6802c9f9be9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ro/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ro/firefox-67.0b7.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "a7c9e889410b608976bc874f40cfe0a1725ba2aaab6f77d7d81cf37ace1179095e35ecbf322f2effd935fb555fdd673a6424e9f808dd5d86171ad810df7ea166";
+ sha512 = "c00bb8c7e6d1c39d5ceb7d33f967eb1d63f28baca1da07190f4b422049c1f3a4d7162abbbce99d9f5b353e3e04b856e919d438ebaea4be664ce74e92cd0c58fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ru/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ru/firefox-67.0b7.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "d082810232a8988b902fe171653fc734e96c4ad996f58f1a9d0e0537e84475c1fd0d3dd481fe95a36b8dee2ddf43692394cf56eb0c00db1513f4db4829a96946";
+ sha512 = "c8d26a7ebe38cf9b9d7d3d212100bae71f33db180ed864d342f2446998b0362a7626b704792e76ebabb70f00fb204629585fd30125fff257087dd81e7ac34312";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/si/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/si/firefox-67.0b7.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "11cc83d5f72c813878a4556079c5e0faf2f870cd1447b580c79ff5c6204e9d07720527ee26a897e7013b3f3b6abea080d2a33ba45f83adb9b10f33099c1a24e1";
+ sha512 = "f0cff6dce739353091fc49d20a38c7c8d911e4870aa56688b67a81315d7e2c7802affd333604f2b6bce3d3422e915f74b66e92ab6c3a9bfda91fa06d6dc9fd7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/sk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sk/firefox-67.0b7.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "f5195f375b0b48f7d97b46717692719a263fe56bb57bff329f2030a862d97c85f8346584ac052e0d5ff9c84dd693761ccdfa1be9c77d71f20716465800b5c8a1";
+ sha512 = "ad6039a84f9951a96df13a4fb1210d068d8e9d83aaaaaf4ce5af70641273be598c42be5d7dc04de3ceff19bb821ee0c2e6799aa81fc77b093decbd2342f91afd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/sl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sl/firefox-67.0b7.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "2ad38cce1cd391a5bcfee2e5ad09abc685953845f9db40ed312f5d9041af1cb9aaaedae11e83c7c194697c148b4849001751325190a9eaa71086c63542985967";
+ sha512 = "243dd384fc56462e0b9b03ee1e9d128a207482d58c4b86fa5f5cecf103e2f5ee97c6b211f073c57946594a5528182ba2495cf21791272a2cc66ece7059954492";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/son/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/son/firefox-67.0b7.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "52e667bd300f14264c88e6f8233d927b75f40851c1ec3df6372763354e8c16b058b3a81b36543dcca957a381ad9e9d18c3c5c61eee6d3756f1dc81795d6186a7";
+ sha512 = "bc929d4d699b382f7452daec9028b2fa25668621a6001a0ab5cc668c582996f6f490ab399d068b3cbda679ca10d416cd6b73ae08352f30e6f8a10586ee4a3433";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/sq/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sq/firefox-67.0b7.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "f5957a9b2642e43eaf5760cbf61420955cb000f5e68df11338ea302832b0283e37da81dd82c80097ae320ab5f682d7d73efb3d6f7a8155c6343cbcf1e58db04b";
+ sha512 = "b9700033307e7aabcb54fb198af0119d576de3bcb774338d2cbea8e88c53f8b7031395bc72d5713d5b4268fa5adddd9c00bb010e816064c98371cf0a65d7f9c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/sr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sr/firefox-67.0b7.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "1c407abffe0e3b403bcf2fddfcf82033fb0189149442a3f627fc92672c4a9fca48e6047d0f63e8c7c22afa62fdedce1cbde76ce5983f95f8dd48a1455d85baec";
+ sha512 = "543df36ac28a266f45f75889227534145803f65b3701d134fb62e507743320fe8f56b078d4f42d193b65b51a06d00f2bb6c9de9599bb66572f0e014d6dbd8b56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/sv-SE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sv-SE/firefox-67.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7fa984889a9ae450a7338a9b32f4c2001d2c9de67ec6650a443c499b5bacd35f2ae9aaa9ced7ecd17205d95417f11e85380689d9d9bc811f1e3549052b2d933f";
+ sha512 = "cac64975be8c887b065bba9fe127d25d298893947a8ee957a75ba316ea8695001c498d7e942949f25b3323c7519c163c275710d635b173a75d8dff3ea38879f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ta/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ta/firefox-67.0b7.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "af4dfd7664be7b70c6833f96ae84565d4bb6d1b2ed3e405ca7a0b41765bad50e183a847b1c7b860b5216085ed651e0d568984595b2734a32f2ef95409ee3e45d";
+ sha512 = "f7e744a20394315e5d5eca04b152546db49546ba8b13e6b99f61f248ed762c207ded2747e89ba73e84b63330d42b006f5c200417ac931f1c46694784eec8d76b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/te/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/te/firefox-67.0b7.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "71a0ab73df2eae31252d80da67c6ac2de372d52a1fc719a79c3d9d8e22dfac3e1f92abe7cc811159a1578f4688ab2030dfb25ec4649357e73ff155f3ac10ce85";
+ sha512 = "1f6580c3744c3aa87e5c0b82d84d97081a6de8db07f6cfb458187f332d7d509a9a3177c51644ccd7a093ead843c92ec371b2e3b01602d7c751415c5b8d8711dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/th/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/th/firefox-67.0b7.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a0c4cfb9214ac387f4231e9dbd7dc9c24bf47c87b05f47eb44530474e09d85e4372cd0a3d7493905d1a2f316eed444adbe096d345956bdefdee0aef096a1a065";
+ sha512 = "653b3aa5d1e62c1ff8d131d657474527da4711203c45a85e219f85107456d528e6fdba7124c5c303858c8274d585fb555883a5edd60aac58f4504ab69e906f7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/tr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/tr/firefox-67.0b7.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "fd93cc618576898ed99eb40671d563b34ca3423bc541c6336f39553569229f9aa9f28c4a402a4af1459e07ba83b78924b8d5b7bebb630148cdb23dafdb91adf0";
+ sha512 = "6b797effabdfe357eb35efbd3631260032d732a7dbc8ebe2963e8e27b2c5db07f55e0e23738eed4f14479b5a0e26abc549843a11cec41297ffc78c2baffacd1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/uk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/uk/firefox-67.0b7.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "428b095abd6f2fc78e2141430866e5e1735e1e1b01e92b1c9dd8bd7d69a1350a537e5aae6655a83a7885f758df17f5a9e383a6dfb21eff1ebced24b912f40aeb";
+ sha512 = "e8d0c9271d81cb416e3ddc78e6cdfcb326cdf42baab0beeb938ebc94b469b1071e66497d1f30693b7b90b03dcfa3e0e9826c93c37559cf417303108f540f0b2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/ur/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ur/firefox-67.0b7.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4e9f6f9e8b1116a29fa97209c48ef537ed2b6a1b8c3652f612dc6b43808d581a11ffed7ce403d1ed282f60d3fecc261d97fd01f36423bf28b5871c6a9af51d8d";
+ sha512 = "4a19ce739f4c3afef097123ffb8491ed3f433a661ea06c908c9ccd4f2e06af1e6a599ce4fcb58ed02876bd45ae00c23f8ea3fb28786cb6456b1d2399b6acc70b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/uz/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/uz/firefox-67.0b7.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "3721de62582e7c4f74bdcdc62b893566d76fe9518932a5a710efeba9f468bf90dbf1a13b8bc24d087144be1cff07be800de5c45f6cb9127e72c1fac316d79e6d";
+ sha512 = "b768bb27409f056818543ff0491f50fd954ccb22a2a17a2eaddcd5f4a5295c0c6d510050659283e70bdfdbcfe145776624111f4ae17c4b28a95b12f98fc31665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/vi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/vi/firefox-67.0b7.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "78613cb653c8bb1f2f97079eb68b9db265880d4df560f89774807bc2e0e2b57de9c7cda25bf527e167c4dc629432bedae1d4ca77e3898276d8eebe40220d30a1";
+ sha512 = "664e3ca40e13489fc66824639616a605f0a5227ddf4f1f9191204e95a323a64ba9ba1e025787ac669c6eb11ed61c3a70eac686f8a36aedadbd4a8199dcf5380d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/xh/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/xh/firefox-67.0b7.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "a6227fadbab4e7054da87b6aeb178df10ed869c9b3661fc5064c16c95d184e50191f10c30981b762762d0e875bc011afbd5a48859bfe83a78359dff432e97d0c";
+ sha512 = "06e70c70539d568814f1bbbe76932d19baa02b4e449566a2c9cda8c67d24305debe01e98b95d8dfa8fee47d1f93dbf4d875dfee0bb20f006a18b2c4689312875";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/zh-CN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/zh-CN/firefox-67.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "869573cee66047a7d929e3caaaf5d8a5bbdf3c59f6427741f563f765b9552ea6a48795ed4b6cb22b138c0665df2cc66f1aa57a41448db9589e8f8b5b32e75c19";
+ sha512 = "e167ae10b29a0313ffe6e2c0f9e832b11a4563a0a848d8ce3f3d74d99d0b6060b3d947e8f7779ca9ce93418bb59cc84dddf0183baa295e83a59789e029be7d24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-x86_64/zh-TW/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/zh-TW/firefox-67.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "b724921603065ce5d104d6f79b76f2c7435d4494c7b3bcd3e296700adfeba8acfa1866ba17bd345b77249a1323f2d1efe853947281815353f0e70823b9c71fbc";
+ sha512 = "e1213d631b1e7f061829860e468ee57b0188cd5b33cf64c0c3a60ea0ecf2efe041ea0081008883aa15f5a204c78d0e764b84bc76e2f43c85d6710fbc87162dc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ach/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ach/firefox-67.0b7.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "1de7e30cd429e527a18e5360d676ad246852b88af7efa55d5a63726a54a6ef18e6cbc3b8460ae9cc7a9bdd49a0e9b8bbdb1b169178f9eeb19c2fb053656a8206";
+ sha512 = "cc6670bf09ab557ee746e750718871082cd3a2e1bd29d01612edd2e1cf5efcd2314fd806c78f3caf4c22407f8b89dbab014349570e40e20a5707559284fe2b5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/af/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/af/firefox-67.0b7.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "0614fe8d2dcaaf65e90735af05ed7f7de05ed8db643dcb2c6e90521a471deb90fff28fb4945169172bb69c38d8ad3ba83f062e239856eee69c3846d54d384f20";
+ sha512 = "af7c92690c6b6c4f060fa0fb6e07a079e30cfd9cec8776ba10e7486eb58f5beddcb80fee5eca56ca683c1f600f55d49792a0a6251a15d37bb9e032aa7af1fb96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/an/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/an/firefox-67.0b7.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "e4504eb558d528750f6fb85c0b5f0b1f5cfb2d7b5fcdeff9279841a3745066e9f4bc36e40ddb61d6762bbdabc152f3b3169055f6acb6249b8eff9251b834770b";
+ sha512 = "941f9395026952442df31e69f3c343e27f5b9cabf8bbffb440f0bd9467559f3a725ec7419533191fded2e166f18b140a9eb36fa65fac588f71f8c0e533e2efcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ar/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ar/firefox-67.0b7.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "c29f8c79ab9b912e4289771604c941897e97ec120d894a5cf1dbd87adeb75bb506de237a4fd5f3946a27d99b17b61b86a99855bf769a95fed94bd7a95368b0ff";
+ sha512 = "613c2736af5a0ab9f9033a50353286538578c1414f908832e20df51f07e308fbbd5dd6705f60bbe39fe7d945542d0b76d902517b7b56f99bdc28e58f50f7bdfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/as/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/as/firefox-67.0b7.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "3ba288c8f7c7a65c28b01c7fd03887236cb8fe7b1cc894acff6aab4482b5aa8253afe44005078313efbb6d6a59bb0570bb1545cec7b276d0ea49b8c6a6789ea7";
+ sha512 = "04adae89682be2eb9a6f93e65878a80916c572e24b0fc53ac0896272878cce0e8d1395257410cb088d5a20129c76479aaa6387d6f502e7253c16fa765624fcc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ast/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ast/firefox-67.0b7.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "02196e4e52b5a4f19ff7e64d43303c5b93bb15e3112cbac246fbf1a858433eb3fbee27f5811a8704efb3b22b14ea148334e1a83b8ee6e9421ffb98ae7a3755b6";
+ sha512 = "b169f44b0e7f6361d1181fa6124218949839d43c6b110803b09bbe38a82276f96954e36eb0d8f90d528746f7916b260ed0b0bde45b7c1b372875bc95887b4f13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/az/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/az/firefox-67.0b7.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "9a9e0f0ba619c1595485e02c39e04be98f06aad5ff377c92db20df4f747269fb5c02b97a6634b792bcaddfdfd8fde775476de74208979983f28add00ea610fb7";
+ sha512 = "1e4b74ed6102b7ba8e8e6f40f3de36788a9654e98b9f56cc0d5a84a83d67909a85c29d93f941cab572687186dec43bda24ee37d46c008b8d21d6760c658184f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/be/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/be/firefox-67.0b7.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "e83484d9f5c9e7e67bf57addb3228cc6263bcc7c9169f23600e8bf2d3b66055398932b476e5e08f9e7def3dbd5d5635a04a02beef3e7a2f3c48da3463c3509bd";
+ sha512 = "cb6a52927341c5c10bc34126ffcfd40e60201254c18d0a05212c5202eb0e44e31fa19826f635f75280ad310a6a61a0a7c764e4bb84dcc7ff31ffb534797875c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/bg/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bg/firefox-67.0b7.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "9b0dd085c86a4b599b8acc8e4360acc02863de24f38e44741b468c632a96afc1216834ebfe2d63f9660b9eac7c3c07afc6be541f7d9b73278be3740eecaac88d";
+ sha512 = "4c7a5083a7b656182fce99238f52c8f197d108d33b40cfdf97ffe477963547a08b8bcc295464adf8ffc40df2f4b5feaa28d25ad294a4a9e7fc0759fb2ab9db7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/bn-BD/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bn-BD/firefox-67.0b7.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "8a2acb357c740ec58ae405b1420b96703f5882e998edfc463177734a60b2bc291191ba66a21ff1ef43038fea7c9bda3ab6cb81d99ef2a7ae3c5e2bf7c8a6106a";
+ sha512 = "5626d60a4369b7ba31c2c860c5eb050af60724ece57cd4a1d5b9483660787fb11ec76ba8e4bef78de42850dfd90a44fe36d43f48a738ff271f2fd35a295680ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/bn-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bn-IN/firefox-67.0b7.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "4d8b9b1b7fea4fcfdbe6be3867d2ff450cd9da8aa68f1a0968c099ac83ed1eaae985d65cc1bc49f72df4246b999c185a6bd80bfd003bda32306de555c285c042";
+ sha512 = "d0dcbece3d24ff4c56a7df33414f7795a7fb7b991e26c552340e969349e0b5a3519e95c8465f4ff5dc5a7b9a11dd13b7e730b43130e34afca766912cf6a4a36a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/br/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/br/firefox-67.0b7.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "576129e42365a45559cedde4f903160b940bd395803444f4e4ae8ea9f330690f7fdeb26a124e2289ab767a5d482fbb0d7589b2381228b0568013298c39a47c53";
+ sha512 = "d8d424953af0c782e7c4b17bec49a9dd663d8a0da92cadc8010344c079f81b120573ff64cedbaccb4eb85826e6d7feec12b7e2bc5ec3b508997729fba13c18ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/bs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bs/firefox-67.0b7.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "025d5556e57388204bf664bdcf02b0c4ac0d261076ee0b8f7508c60e11f5f3db5b6b286be02dba3ff300b97f91fbbc757523930b2f2af074cf0e93221662ef05";
+ sha512 = "4da5029faf08b6fdeeb1eac89ebe49f59748c06e77a1ef13d503eb71e33b5362c74474a35f7a907f528dc0f59b78f989df45d8c35e83e6ef971c425fbdb3a0a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ca/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ca/firefox-67.0b7.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "c79a135fbeedd25194afc7bc26d507441ebc569bf5242c9642b0846eb64ed067f4d6120d36c41eee1c09879e0ef349670240c55b1ae16367eb302a827e9871c8";
+ sha512 = "f990b67201656b18109c6827853bf064d7726fbccde19e5058c7860b2e4b993eccf1925d2a77d4b1c4ef4c3b3fa4f2368c49ee0e67da0405b762ad39edd91f94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/cak/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cak/firefox-67.0b7.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "c81e0116ae56f946315c924cd08fedbef94ae6f808cddaddfd8deb0fb02f1d03639492aeee0f14ae7e5e35face7463d267d518ad743101fcc9cbc09073e66526";
+ sha512 = "f0e6446b82a011513a603e903b910838686db5b771215deb5620c476f51cc27e2f7ec115f876cd710a1255e4edc1bf888afd9f1b370bc8fd5d4a40c3fe99cf3c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/cs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cs/firefox-67.0b7.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "e98f38c27df71ebfe98ee4bf7c2f83b3dad59c32f18f5988b33b3ba634745967e0f6bd87cdd686c34aedcb2ed82903bdc7d39aa6dfd4d57b75d6f0220ce72ed5";
+ sha512 = "9a0246263397595b5aaf23b0d73921cd25d57db315717bde934b67aea0ff917869948efdaa25465185f8352ad9e7b1e8f784cbd3d79c04c0f5ab9d34428ceb77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/cy/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cy/firefox-67.0b7.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "0dc65fa91f0e6dc20d521d604e78502e468729a072ba30362bd45749f6b58617c474f420148461cb420676a7f474a2dbcd63782250d497eeb3226b0ecfe62907";
+ sha512 = "34f72078d377157739b407f685e9c6835539c9e2f535bb52e12141c94b993ac1e389b251f316bc1a3a6d5682c7de9f2484b18e48cc6c39a18add56eff17df0c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/da/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/da/firefox-67.0b7.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "72323391c6d05186d70e441f6ddc6a703d168111181c65b3896fba2548eb9abb0ab7fbf03cd179664037781cdd82a238786c6b00ca1fbacc6c8144f739cda56e";
+ sha512 = "5743b79c209e89dbc9c902dd7609581577765719d1e0148373f85ebcfd3b5a2f225c758033583455353af22314651a7ddbd447b65de7c637b4ccf5eef4401a65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/de/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/de/firefox-67.0b7.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "859330bcfe7b4cc7db395f44f8c1f415235619f1dac51e3037eeb12fd3625a733b470ab87da019a1b95d6f53c3b48a015d38ce1c749116417a21f3cd81f0ba47";
+ sha512 = "4f22bf0fa90f9fb4156815fb9cbe0e8380b7b36347f548e34709a38c2b02beb324645f0084148c2b054e2610d8ea0029e68db174cbfff95531d8f339c153bd7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/dsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/dsb/firefox-67.0b7.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "91d4b0f70b9bed51764ad02328f2bf9c29a3686b4ff32b45cb46b7e1717adc665ebb1c4c0a1a5ca0714c95700eadff7f8118d7688a14784d22259d471f11ac77";
+ sha512 = "3cbf358e86490dc3c466fdf69a9bb6bb2bbbf56059a81bc2e1d551998ec07c319d7e9d467bad61e6e73f06fe2235254fbe7b2690c9f8c426d4e332851ae18f56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/el/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/el/firefox-67.0b7.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "47383cbab6b8900f450f84bcb38e15d0948be0941bd7aaa28ed91e3cb4453735ce293f818f38f2e816d683d983911c0c9c7ba170eee62437edec73c8c07051a5";
+ sha512 = "fe632688fcfbf523e9ba3c1c7adb134631900f37dea6381fb41c4a7fce67034c0033417b5ef8c87cb33b303712fc309620844614f8719dfc440ae634c1dc18a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/en-CA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-CA/firefox-67.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "d5903366e487bdc61c52cf8ffc42f5f9cb890cd00e7e0a35b1011c83ee977196f1a0d56bab7046b7edbb936181ffc7df254090c5157f1eb6cc71f37ec9c99cb4";
+ sha512 = "15a26c6a0ec18625708b0779f00d6831146f5146f7ca0bfe35b00808ce45a3ebf29f129dcaea5d2799feeb1ce7b0055f76f704f448b884a36a354df4467adfbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/en-GB/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-GB/firefox-67.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "f561418b07588a11d66d6bb0c016b2ba7cb4e09af9e32f7d8d99e7d3a106ef3a3f04980ac284b608e9b9504564d9b7d23dba4fc82b6e910f38eeadc096606896";
+ sha512 = "5b756fca80fc72c6f3925bf1df427da4a118753bf30641b266c6c392705ec87834c1fc46ac08c1d54d032ddd4abd6fc35a71f47fc89d04c766c094d863daba1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/en-US/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-US/firefox-67.0b7.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "d93ea0e8b17d6085115a072d6495136ab20383a57400f3aa2969f12076e0f5aeecc1fb6d0459c6e34a1debd8339f0804f81df00ceececc2e4264614e516bad64";
+ sha512 = "00f3682c17fa8276e7f79ffea28b80a59b20063f6a945fe7b81265966cfcd526bf10272cc174aa600e4393c6e5b894b90673dbe170fe571f03412d403dfd630f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/en-ZA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-ZA/firefox-67.0b7.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "f0d02912d321fe2023e7c9436cfba0665baffbe27a6dc3b98d8f9061954d5ecb8bfc2d75de28a8e2068acc1fc05a75f8fc6a10def2cc45c35b6cdd60a68ff103";
+ sha512 = "8fcbc170bb6efa955b577c7071e1c78fdde129508bb47ae2a266d6b79e980f82fb3c615a7453f3eec6db3f9352a4809fff2656c65a64f5bbc4afaf75fbb225d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/eo/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/eo/firefox-67.0b7.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "295ca3fca2c63bc85f59fd21d673e8f60f6846a5ec36c29ce7e36464b14a7fade07c2c16212ec19fcf3c872d73215195e50994c60223afa2dada1056d23bc203";
+ sha512 = "05915f7e7f38fd0ccb9926ef96fe2641efcd42073d8acd18875a18fe3c63603fabbb66bfd83a24111678f1b38f8ef172c2524afd2a0e4632b8920853ed381751";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/es-AR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-AR/firefox-67.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "f45f3a51a9e6b9881ce1c5f758e1e46dd97a7c49e3448edd3ef3277aee220c994a06b1cd005bff270fb21e3928a0ec035930eb6c42d8631c32a66a5c493afa17";
+ sha512 = "bb88d6801b9416b9767488ede19c52d9e9802d895dbfe2bb5408169ef43732e06696243126099e46619a08d8d705df4d66a6cf87ab58ce3cc8dc99fd8949b4cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/es-CL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-CL/firefox-67.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "5e7c5ccb383281006652b898f1d930aa81081fe4e5896f173da5b4a3fc06be0c5208ece83bf31507748b555947fe0d14cd3cc85a5689a1d6be06912786070ad5";
+ sha512 = "495c588e1059ed5d212c707ed5aa74a3aad8a372d11fed0da2f810928d645fee0d7d9aa28f1185ebd9aaa99baf14b1a0fe41e34b9e5aa7e00ecf46f9bc7b78be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/es-ES/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-ES/firefox-67.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "fe1bcf7b79fc631402332f182b32fdba58f04c9121cf770e1c22afeaadb6323fb92ce889e19659c8f6fbdaa5d388e1075ef18b6fee72df33459c43aee1aa0b13";
+ sha512 = "4be53b2d2fbef3ae7f1601b8869cbc57075a998c9847c8ed333ce9def39c3f23b9ebda61f14fb6382fe2aef5bf0a253f43da4d07d8f51080c0505c7c2cfb9e07";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/es-MX/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-MX/firefox-67.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "b7e9b4d9dd21f4166e7d23f42e68e7c9f8b1e1bddecd434a997a7d584a926051a2e32d8e90eaa59efdf3b4ab0c44ba86f24ab7ef7015dfe3fcf1c9bad8af22a1";
+ sha512 = "090166a767ba1df247d74116fabaaf90f751c27cf7cf55282cea650e1f10747966aa84e813ae79c891041c3adcc44e165bbccf723d77aa8b9abb6e3957602a69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/et/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/et/firefox-67.0b7.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "29fe0b389e94d421c4922567db49807ca09388d949b16bae4d0173727acaf2d5ac027c32a668abef25ca01e565713a235f38cd12cd46c24ebec6655cb2b66016";
+ sha512 = "56f84137cd9643211ec1de4891261621eeb033aff71704318e69a39d034fe1ded0b3a78a1d98a90878b841e5ea4eceec7e3a3848dc6743a121c8616d216a18ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/eu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/eu/firefox-67.0b7.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "6421e14fb73553a6f82ec3a4e4d49bceeb10e4d7cdd66f4b3a6e574dcdb50657cd09475b636ffbce0e33d9eb37043eacc95ae9072bfbaf593cdbc00e393a4022";
+ sha512 = "91457da7072aa989bb18a35541f85a902cec6d425e583ea907c4ba31a65bfbb5991baae4357e0c1edab5696ec68c79c73e5033aa6fd14f2cf60940133c5eb245";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/fa/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fa/firefox-67.0b7.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "4a30d00e74c65ac0a8d3faac436bd366f4b88043632e36edc8f417ace18e6f837da987efe579714cb27f597f399d7ed0f66c59b80ae79c19ee05c448e6e648b5";
+ sha512 = "3b29bb2e12c17773d18a157c8c4ef602d80b0e25c9bc399d4d803daa6bbbede64929064ea5daf4f0b0a514b4032801ba3fa8ad8d0dd45ee98a824c2daa852364";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ff/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ff/firefox-67.0b7.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "3f9d67ff5702b9e8dc26199d990dfdac2a6bd9284fcfc591d86d0a7099192a3ed53a9c47982f9a6e0665977bdfb9ec955fb7faae7a1f291fd0352b47cfea9ab5";
+ sha512 = "411b8a922893fb37c05358c5da39b63c4cb8d1697667738bdc139fe2b2ac6f0ddf9b94ad7214a323cab69748990dd3a45effb336352c48eea92f48710ee6c40c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/fi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fi/firefox-67.0b7.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "7f1c4448d2ae9facaa6b50b8f96b254cb1c3777ddccb0125fbaa827bdadc8416662b7e9887e5ecff7647a1b2e57eccb40255ed5ba86307c5ca735561dee26741";
+ sha512 = "526884ed9354b13eb3d2385d597eb43d2ec40ca8f0c106503f3e84a110c00c5da5422124aae2cc05c3e75999d4d50598909bb057a4dcaa389ab6dca726b3c378";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/fr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fr/firefox-67.0b7.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "73faddedf5f29e38af8dc926347e7c0c814cf001564492122500559254a9c0f5ff4730ab57c0131d271f598ccd09868713b1f91b28c71cf56f74398f4d2bdfd6";
+ sha512 = "fafcf0501a1624f145ba02b08c4e5e4d160af0fd3d9dd13c22726ddd8b40108eda1bbd3322ba84dc2fcf7ceb39593cb85c614efe5833ec32fae767cafad28c0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/fy-NL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fy-NL/firefox-67.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "9b0505175c9842262811dfd197d0b3805b79b1a9462063dc513b076f951cba4add15fccc174a1c3d7577592140058cd1a1549a1ad1371ef26f16591f52f37c19";
+ sha512 = "e6d12c42dee42740087121eeaf961d279e121e41ac79187e18fae5bba136ab27888b3b35b6db4899a8a77debdc785dab78c4b4fad08746e0e752b1082978e18c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ga-IE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ga-IE/firefox-67.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "452f62e56c8d3a08c735579c93112bcf08cd85299fd32b07a19ea9b61d2734d6c282272afdca10b8efa362ac0328dbdd0414fb816bb2fd2134867f4287b02378";
+ sha512 = "44db77514fe972772b8331e9c502eb3417a810046046cb8ae48a1eda0984e299a58058a685d81c408b0a72f3172b24bdb57db70d595a2da93b90581d01a5b401";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/gd/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gd/firefox-67.0b7.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "96551a86bd630765ec58c3ea03bea5a2dff017732171942edac8ebe7f53378cb06808eac4fcf84943d9304eacd997fce0059a0cc88f7beb6b6ae3cbdc7f68eec";
+ sha512 = "2b65bc81c0c9476b3196f5489eaf2f24502fb4abd585c0b1d9046a63a2bdb0f16a05e928369204ea028cb215a40a68a459c1c5f988c5d6882aa15d1e0a7b5b1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/gl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gl/firefox-67.0b7.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "a8772b5e51a8cc78ea15769e36c1e3f8f5ee67df15700f1205c44a83b203ba1ee73e8924823f84c2ed0ffaa4e8da2adfe907580e958c675ad4c45717d53043f7";
+ sha512 = "8d4fa0b6177b7926eb9f16c08e4b5f0e430add37622d712d77a2099c63e0fdc21ed9e2b7a72457868d968c1af42b3aa83b22c8f55cc913ce1d5eb913b12d1b2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/gn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gn/firefox-67.0b7.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "5f2e15118861f1b9e1c10c38388fabc57e5a95895aad1375cda9227457d0a66d8935d7c71ea60fc276c258f5607923654c4623f5c5f6277f4f62763d4afc85d9";
+ sha512 = "1bf077f3282702124bbb968057942e2f701157de1b1e678cb55a0280907337952a0c3118ec874d0ca2ec26dc2063769b4cc2a2045e703c1761076e45e6c061cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/gu-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gu-IN/firefox-67.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "eeedd81022a1cce8feb05109808a4aa085787fcc9f1e6f733b1bfe4c7f3e75136c2379b0c7955d37bb54bdc83f8ad4d8285002e82d4896c9c80e3c6e82db29a2";
+ sha512 = "405a61a2c70c26569059bcbbd1723ce378a9d6a40d5373e294c1e5064b503e5b68a42c77bd023920348bbcfc05309605e9ac102a3b1627525fb3ec3fbbc58be9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/he/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/he/firefox-67.0b7.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "caff91df5a15edd7a1967de30bb90697a5f816cc066b52e325faa5f3c4857f64bf9545a90fbf2bb0e22f3ca480633647ded204a842231ab5329d60d2a9189ffb";
+ sha512 = "09d8d4a4eb70ba7da3a7d90d61ebe23f3943b4bd2f06d356b1745e7d9297f1c2160312ed1c8077ddeb88f6ae27c675a5bb5f1f81e19d16c6675a5cf2385ebe0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/hi-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hi-IN/firefox-67.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "b2809f7a45dec4e018662b02989f54529429608e3dc1bdaba1ccf0b85d3783ff53e611a2c27805831c43351c476c37f60b9448aa92410f67e01f25c57790ec3d";
+ sha512 = "c8c65bda9d1582df1b015425466d6806b41a09f4bf6e0146cc07932abc3e827db4fc89083711102b0716f6325e563d8e7a0a3c25af4f8e8f9bf31bc33a33345e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/hr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hr/firefox-67.0b7.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "910c3e9bfc57c8b17e44635bf4884cf3df5791824d2025fd959b59457842bc40c197f74f34f5faa25b4c3016b21af471c8b69fd3baed55a581f2800fa12b8b15";
+ sha512 = "2beffc8293f955476c10de22c8fe45a46ab7769ea8ae85f611ea23c3171ff01dcc2df50907ca876f5d13b299d5b0959d3f1cdfa5153427e116a84a08c05fb144";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/hsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hsb/firefox-67.0b7.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "95151f7f43b3410a20a1fce1c842b991dd96f622bb86703e1a6b510b4fcb8779d69f799a3f2185371adf8107273e379ce87d7c2221ecb9b4b9b77f4b1a189e66";
+ sha512 = "87efee6e2c24a0891193a1e745ab34f397e3c557b8c2e9491d2c935eb24bd221fa562b3f22eff71c1647ab55d87374e70541df0696a12830596dfe8aba23c6bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/hu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hu/firefox-67.0b7.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "82d0d85616be5cefbd29e26855707959d4735521e5e9898f3e5779c81bfd43b7c6e3988f14a05a0bcdaa20d430dbe01f4ec28eb2230c04a5d9a9ad286ea6301c";
+ sha512 = "87732b73fbf821a8912a45cf873d4917dde729cd731d53c0c843d681d92681d395981152f93c1ea8fc415a93053974905fb03fcd6a4f71a7e07b12e0ea1ff9bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/hy-AM/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hy-AM/firefox-67.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "7e7edd213143da25b8f65999bdaa948657e44dad890ee1a017250c5ad4f412bd055b54951d6033995643b0db7238f790a281a1c6b489e8358fce3c2c86a96939";
+ sha512 = "7dcc8bd376fdf4227ac74b1d24965d70b274975800fbde94682a24de3c1ef8348581be3ad9d0715f16c0c9d8ff4995c31e4d38d99d8aa72a50acbaf8d4888e61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ia/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ia/firefox-67.0b7.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "b2383594b7861a106c59187bbad1368ce0ea940661e0263657ac81b4fcbfb7007128aa602b92839ce0fd9e0a0c8ca52f6cc98cffa4cf3b766ab93c442b3253e4";
+ sha512 = "806b578c4005107896f6455e53987ab23785c737169a4f553d4e152345f4e77a7014f38a27407a4310288c0e2d08674b349f9f54bcd02c2b3fc7b30b27fc0a17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/id/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/id/firefox-67.0b7.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "f65688844cac3c6df375d4ac33e1ea7b2543ccc297f9395f36a1042cee21f4c0ddbb9031472989cce8dbef5d7a4849c432f51affe2cb37ba0be7d3adbba20d16";
+ sha512 = "3c054ce894b6c61bde78f447095dda8352593da1879572234e10f0edb49fe89a0049f84404d45c6dea0e6e2aa75fd96a606e943260cd83166d447e65ecc435ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/is/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/is/firefox-67.0b7.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "ec96914385094d0d91f485b2e0f913d80b0be9ccaa2e32e33fb53a8c774e68749611499bb5eb84a4e0306674bdceec29b4eaea4e5caf35ae09945df0115c7506";
+ sha512 = "3e0bc49ba210a864cf083ade56b89d1c78f93b2776cd3d71a1c3c649ecb5053942e9eda9a2d6eab97250268c9177bbb8d81c764860e5fa1a4ccf41f5e540fc0b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/it/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/it/firefox-67.0b7.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "fa14ecf7557657579d7ed99e9b38757f5c7ceaf5b7651d0691fa1f79844f9ac73624927e3e61670d804eb9b51edf192ab106b8c45ee9fe2688a7c2acf75f7621";
+ sha512 = "f410dfa055193d5ec70807a9374b9c9ec92a9f5484d52f241ea15c35ea60be58e72442949036e153e4adaa0a56c0ef0070fcac13258561b35c6d09c5dc1b3b42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ja/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ja/firefox-67.0b7.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "e66f742293156ed55c73d6836e605a93c07b59ed8ac782a0ddb05d3037a0a9850ab80a9b7108e9a68d9be0fb551cb887f7d6a47e32e69625fce680b36246ddd4";
+ sha512 = "b0dd90d9a944cf99d76ac5b2f68c81d90d2dfa4fd544f0bcdf239bf091ae0dc96d5a5b4d190531fe90f38bf0d810bbb75057f70ae8cc090416535821f3630794";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ka/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ka/firefox-67.0b7.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "670988adfad3e3394ee00ba1012f362284116d42f68231fb1f9460dad0c92464016f21ca8b2387f94a16bccc959298b84ae273dd3007e382eb1bc36240403ae6";
+ sha512 = "d7d91f22ed6d4ac25fe67685aaa947fcee5a624b4e501954809d9f2ac3abd150e19aac283636a10456f5d18b20f4a50084ace34bd8eba7a82ddfc0176efe8a7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/kab/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kab/firefox-67.0b7.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "1c3e2b19d98c30daa7ac662dd1cbdcdce0f50c78e49bc2c0d732ffff7669c5e8d54feda5a0a2fd911532a4d92d8b95ad6a0fbda09d9d9a6deda19cd2a9af765f";
+ sha512 = "825c0a1d1dcfe3206567bf24072c27a62e3a90ff839a59ff9402fb669df77a0879ed2d47904081c6c5315d5c8079f7fe4ba0468d8ee10e5f98539fa349e4709e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/kk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kk/firefox-67.0b7.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "38ba521126874287c25ef6d7f8434ce690615bed64c54f211b5d2be8413fbe8368673c6d886032577e70ef680ae4d580cd55994c2ec03c841a7e0aca96bae58b";
+ sha512 = "662f37a871ac7b8b897428324ef31752bbe3fe64f319525e77a42d873497decde5153a8ede2de135e79f9e107f0ca014502d27cf11e1d94ccd7e63fb0e7d1da9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/km/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/km/firefox-67.0b7.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "7a40a68076dc5c12525ffaed910204eef377dc33d4490da94fe8475a85bb806be29d146705bf39b804298faea49a94e2f97a59b2ac10e48b114eaec09bcb0da5";
+ sha512 = "ef722c12393f16945fbeea506f3463b37feb555db84558b2a193d810d4eaba0b94380784a2f1f0e8385c1e182a3137d5c11683bf6aa3525805b0383f1da70509";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/kn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kn/firefox-67.0b7.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "099f8a81e4800b47b96d0ca1965b7c298d916e8fd0e2d8b1425982f60e55564a1f86b0b84f4e7e98199ef6e1ddb67d1885bab99d89ab1df0c31fe88584c14a8c";
+ sha512 = "0b17f9793835559512f779e2939344775e8c29e8ff760fb3521e3425e8b306b6dee8de993837f894f55eff57e82756a9335acd35e26ddd5125540ba3037ef8a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ko/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ko/firefox-67.0b7.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "6d125e9aebfad15e6db11160b094468bee8699ef23e6945fad5978c05cb77f36aa814b7a342b5ea35b857ea4083dccbe72f845542cdae6d5a7e444b7d2b6eee3";
+ sha512 = "62e694465b436294aa52919e3184257e096300759da93cbad3cca823c64a6102b7221bbca36dda9eefc4459eb70969dd1141449d4118d5955abc45fcb1b84315";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/lij/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lij/firefox-67.0b7.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "0f972d750cac614d2ab1a5c2f0b3dee926e161cb31c49d0ed3c034e791356cfc2b200e69c5b59064dfd6d5afe6a91a82ffe69198d563146a1c729e65f0375350";
+ sha512 = "b86473816e14f0af2e916678c0dcfac61c315f8686194f25422d5a0179d7a741b1dd9e53f95ad09b9e59781e0dc179bc3ae598fd763c96811ecb8317903de980";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/lt/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lt/firefox-67.0b7.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "c8589f0fce64104d939c527745c11ede8b87f2dff5deb2a281f2a8344fb8efdacb4f7cee276873787f03fce7317097c6a261e1a7c34e5fe5e0d637574c42ffda";
+ sha512 = "c98e0f2c5270454817688aca95efb7af028ab46835e242348a0977bd6eb350d1cab8583829647d226b149a24ad2c8125b2ccff88f1c29046cef6e05e3081db9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/lv/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lv/firefox-67.0b7.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "b02552ef2afdfb6ccd0dfd708692bc750c63859af2f01565c14ac274f32793523fd6254deceae823fce84b49167f40779b7c9b87bb4246ee3d59f70aebb0a0c2";
+ sha512 = "bbc568daccced664a217d962aaedf48123bc123243fa3920c346bab6f85f4ea19ed3664d60a9179797c2089baf15e3dbfc8e2d84e56d2bc40a54f4ecdea2d032";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/mai/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mai/firefox-67.0b7.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "3758f78bb9340e45e576d1ee77b37b21d9deb36c15ac55aa07f537aec53a7565d791ec02c770044db8c5a6ade3aa691a9e36428756c68e9c9fcaf5d419a94786";
+ sha512 = "10ff02bd9503c422692f39e27256d7a6cb2c1cd3b2188e493cac9b0158775c7f1c36e733433933b8290a7807ce6d6ae57c9c0ff46e6908300d0fb6e5b8c7f39e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/mk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mk/firefox-67.0b7.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "d2cd50a8d290241f62c63a9b2f70dd82ae5cf9a158004d9d27ddb946edab410e94fde09b065be68d514995a26328f3b19f62ef2e8109bbf0a17e0efa95c60b34";
+ sha512 = "dc5438604cd8cec32aee799f03e7776f97ec03f50d473f19ca468fc7bee9c11ff5b92a8b14fbaad218b44c106b39a4dc7ebb63355c80cda4e925694b7635aa17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ml/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ml/firefox-67.0b7.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "506b35fe63908f1d8bfb015f4e3907df86d9669224669e90cd0c5c387c1447bd045bc32bb076d99d2f93ed8f838e0fbfc673294032577a34265b6604788624d7";
+ sha512 = "b6de0d78c6202e2677aadcb0792989277585c5626d41d12bc48b982566879b5cf35ad44d8ad05cc6d09b1ee0e063685c87ffe768b6791375505b192016fb328e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/mr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mr/firefox-67.0b7.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "1bc9619204d9c9b58c378843d007ce7c34cde08d1c9da15fa06b91b4e43a19a606f014cd0b6237da3684777a737809cf796a7a32e3acc1870f7ce500d230d1e2";
+ sha512 = "f8660c94c8316de8ba94f9d5aad35ab3ecca57cb307bb49f5ee5867e3fee12405c210f982f617fceba69b4b8e4ff2c49767d28a00b1ae5643172ec5475512316";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ms/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ms/firefox-67.0b7.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "3666c9711a5195e8ac38db3ac4569435727d7c2c4027d7f3ae0249d53fabb7940986d42e9e4b4a0d8f8ef628d8a725919fbf66eac8f3623244eed834c1353934";
+ sha512 = "b11a9c2ec0abc8c623e3d1a13eeae1b184f2b2ff5ad9f8db62a4e5da118da2ea9dc02113d2f1a54246a07c7fc1e041942cdff4e44056e5584815fe0e4d0ad99b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/my/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/my/firefox-67.0b7.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "765cf716c8b8c16dd584d47c828c6ce31858d61e18e0576e616cf5b310cd468e351e409ce45405b2ea62bceec59a6fe22c2469026fa960cf6d8f761a2e61cb2d";
+ sha512 = "08aab48716713a02d779ea41a1fe7396a199336a84b79c97a4bd8da3201e71e5c1afb48acf731fc9653316b05d53cce0f85a1777fbb7e2f02de7452e137d2727";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/nb-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nb-NO/firefox-67.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "a420bc6aea2647a357ec249f89e6dd3f00de21b8527cd365bd7a9653f64383b44824c776c2253bf93e358841ca24688da671069036655ba56abc9b87f2ae7107";
+ sha512 = "38e7e2153151f40c69712ace80bf9fa23aadc1024a2da2e8b54bc304e97f9cf3f0b93779e194ca7d352ca58234eb056cd9bbc81537f666bd4c406057c88ffdce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ne-NP/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ne-NP/firefox-67.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "b47767970c5d35a2602fd05b5d8460ad523bb2c1142e86ab9d79ba20bc4c43dd818c38de03cd38e202bcb87221c364aff80c09fb195ad29f02a7259454c15a35";
+ sha512 = "802a0832d0767ef3618690da5a30117b9d41bcc0aeacca32657ecc57c39db1fb495ecbe211a47976803f50f6a314df08ffe7e1b17c436786d98e31e2ff4423f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/nl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nl/firefox-67.0b7.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "52707a553abf0eeee782deaf5b48aba9c39d874598a22e3b34b0ba81c28184628bdbb0d1199cb5d887eed1c0a2871a96caac87f8e432c703926932041b327f2a";
+ sha512 = "56616e78daa5c44a2e7cddb64e50cffe0daaba8a245f12d842e6d7657dc22ac030ff98630d2cd1693454fb9859bb62fcd3119affb9cc950ce7d06a1eab123cbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/nn-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nn-NO/firefox-67.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "710a6c6ab9eea84655419bc4d9df1f59e9c7247150c191ccd6dd6e3f09c8d53029df0e59d84b71358b75cb07aa1891e53bc342789f1e84861d5aebdf94b305fe";
+ sha512 = "245d00bd0517f8b7cfbdc60a04fe37ce491dec9106824c2efeba8ea401e502a1d49c9d5e88ca3b0c712dc74beded5c19b4115922662373ccc3e185802547e7fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/oc/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/oc/firefox-67.0b7.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "3318f4e3b12361df8745c588b6dbd5d30757c27ca454e34d4e11082a012fdfc7d057cacddd3652bf644f7d1e35fd27993165f326591aad5f5d6567e473e84f4f";
+ sha512 = "b18dce7f515d26ad694370888a9b78710d5ae75e99eff6274ea29bbba7e9c8959013eeef8a20cc2709c318c9cc054b4722ccf0f13bc583963e1b50df84eb4d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/or/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/or/firefox-67.0b7.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "a31c92880d7c4b0d6fa38c14e78d1a04d525f4e5d850dcbe8fdb391b94c400a5c5cf9bab545c0b3da69363431fcb2bd4e3cbfefe72fd1569798197b444a654be";
+ sha512 = "c4ace90090a9473dbbb14575980e8598f998bbec64db3d9d9f77730ead00698b63f0992b95d82b21e73d0797278a87890a485862df19f0c1c972c31b97a70857";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/pa-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pa-IN/firefox-67.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "1430ae5415c3a741533ce3c47959ead2576bcac5d5fae8aada9d08b3b985cae41fa67ab8bde1446fd76c86e4ad98e9c9612e86e4c045e43f306062027ae1a08d";
+ sha512 = "3a25e29cc1e05ca625a2f420fb4d027532999fab675ada891d8b8b54c502ad40bad408fda7f8ec9a3269e25948e8a42424b8a2cc7b1e228825106c8da5a34099";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/pl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pl/firefox-67.0b7.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "832c8d156fd5eccad841b8c2594e710d905d5a9fdcf9050b8dfd4b6cea70754f1d3c410a3e9027fa0f58655b8259b945cc40c0b7fe2faf3cbcbaea61371c630a";
+ sha512 = "cb6631f1dc737157ea0d17552437f2ed5cadc36e390d485390aeaff85fabd11780d3a5d1d9217e2129a53fce30668ca20e68f32470766712c2e767e8a26defb7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/pt-BR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pt-BR/firefox-67.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "211898f366e9525fe056d3518306783949383e0f0ce8d58a8a200c131b238a946c40ed48f705076d460f960ff8dde5ad990d8f792f3d7ec1b3de835c569dba46";
+ sha512 = "f50a5a71514fdd0c82f9cca78ac67cc984772abd5f9109f60270db64f81f3832e8612ed3b6c23e91642017da9b16eda825fe783ee28eacb29edfa23b1e6c3d04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/pt-PT/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pt-PT/firefox-67.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "801f436d5e898db798f4bb676f0851fd0c4211447b29e77b92d9dcb263b166ca7fd8cf7eac62ba0c0745bee395b76281994109290e4de6bbeb2faf851b465d4e";
+ sha512 = "dd99864a07358442c3e97cc889e1a891df6db469f6238c13b36acd6fef38063de5bb307319fdcfd82c91a66a9f67f6170b0a6379f6435020fe30e69884829076";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/rm/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/rm/firefox-67.0b7.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "88c9ad5b1321742c1d9772025ef4fe2af17c68b26e0cfb0ef9e141d79e64c126ea283cdea4584dcc5502ce0731bbca8d2efc769ff64796fdf0e4f310910a7c0f";
+ sha512 = "2d8f8a8c4d9398d02adcc9d827b76352b761235ed5c43ea0c4ee5798d19d611e3aeb9fe4f44df874a96a1905bc7c5e9d7f16b85606c62bd4508e5120fb5787e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ro/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ro/firefox-67.0b7.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "b19e845ccbad456fdaab9b7ff8db805164575f03250d05ba9e68f05cc093f87c6aeb7bc2906719f10fcca46a756abf343b0c2ace28ab527c41a263ec6dfef46b";
+ sha512 = "513698be75508cd4f59da1fa8f81b5954b5082c402cde9a263a58dfaca9e27f7aa5dc87eb0d4cf6f15facc2834c6ad121cfb89744c1b00c19181a2f05c31cc1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ru/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ru/firefox-67.0b7.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "8a4ac0dead737c5f2152b7a2cabc3c913e863662c229ef10caaed3a3ffeb26d901357b42c9a6b21a738c0d7903097826a05bfc22483c4f3bba7fbb3553d993db";
+ sha512 = "c4cfdf7a472bba06ab3035845c996b54a3e08f5f4cc380fdf8752b5d57aa3dcedd9248aa1e0f92655762e2efed8e8ab1901968d65b66ae565b60404fffd654de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/si/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/si/firefox-67.0b7.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "59f38709d47b24aa191b4d7a895bf0d84cd2109b9e3a369bea0fd3b6ad34fd355fb2d2504475421d2aa53884973a695a26a23fd7e67ea197c39b8f1a94837446";
+ sha512 = "ba8bef7194359cbe9a1a52af4ea5e8615a3e3688cc0d575c76fda5319684aa336c59e2492ecaf65ecc68939996243fc07f910e3a2c4a36de876130abe100dba0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/sk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sk/firefox-67.0b7.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "1af7893d32d0b92054c6d193a74f2a39b7b4b57489375b14d2071c2d961ea0d2de3951b21688b9d4fd1df80d3a1a07953c04fefddcfb4c1fc455a1c453707124";
+ sha512 = "afed2ee53d88d86bf45923cbf00952914c01b6b70909079a25fede7db3cb221433c5957788875a00e5788cf83a24f771399c8ca77661d042fa58de967b8fec55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/sl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sl/firefox-67.0b7.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "ded50cbc0eed584f05d4f51d93559f17a772ef2b22d78a2528ffbe35d820d9c66a2feeb60ee8fc3c7bd526afef738408cd0b75888054367f0fdc2036395c98f7";
+ sha512 = "5482c61f33923473af23ac5819e6fe379c497ee4dbf205fd1df14903bb59c74fa41f2aca9a98116383675848748a992a11cb0fafbfb227b41fd168c071810586";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/son/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/son/firefox-67.0b7.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "488d2945e65391e99db380018bb1b15ea71bd8c8cf405ef8677126e7a5d39c283ea566859447b28ea7a898ed39dfa774406ee0387c0d6438312fd97521bf5542";
+ sha512 = "6b5dc673099a66390dfb9307a93f9852ff8c2e6f4ad42e3ca3988fd53b5bc2fc03f51bd91d1b93cfb4fa7d6f481681182e961e08c84558e14cc19f181189fd60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/sq/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sq/firefox-67.0b7.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "8cead9353559ad7a1a2821833d62783e9bf182e836c34af5a9a564dfa95c45b2c9eaf229d3677a605f81b6c91d1b6975af1979368c1fe3d36ea473e81e71f873";
+ sha512 = "ef584e79c07fce073e188ff5ad24138c59b764b144a5eb80847142887ac007d47336338e75ef69f1c27063294e2d65cfcf7c49a25ca59b294481463f6add1b9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/sr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sr/firefox-67.0b7.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "70bb9688e3d693aa3a88d8e73d41b45481da94737fb383925f8ba85c180ab2944a4e358f3dbf02bd548d283ca7206ac6a8aa6e94a1c86cd57db1d87cc2dea013";
+ sha512 = "9ba0eb04dfd9355163baaf446d3b62be4ddaedae82558b5207fcb4ee08c315d1f86606cd917451fc6d2bf1dd33693ded40f66e17aa399a0f33187b038fb0a04e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/sv-SE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sv-SE/firefox-67.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "95555e40b3088969082ba14a24a7baef71bec6394ec160d82c3acb6c00bd6a3f6c344a1a91a7d17d0d25ffd047e70b0ca90daeef48c0f19312ee2a1829497029";
+ sha512 = "4a764e632fff6ebe332e02473a17038ae6fbcff261bfd8ccc109751208002864bbdd9040a0ed706862f57f217b4dbe2e771982837ace14bc11177624d396452a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ta/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ta/firefox-67.0b7.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "e85c7da5c3fc77c0f549d2f78029d211c3b6a5dce0a3d91a7d7b29f57d1300f041b8f9a93c6fe91e5f9266f69733c9a4fed1a34cc39738218ce8232999f9795c";
+ sha512 = "b15916fe4d9fd6fc634c98da18de4ab970b52bafa1cda862ad81fbea2713ae40e11a2e472e88dab813cf6e26158cd2bbad118b8bf48061360ce0cd6f3ab8c669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/te/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/te/firefox-67.0b7.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "dcd0f4d7f851e56c44296651f85e473c211b04944b7a1dd883def4bffe1bfb7da2fa0f390e9814ea023a7d542e38c4aad526c31db8fdc9143b305c6f7d3f84bc";
+ sha512 = "4f25e30a084e2308739a60513ccbcc4eef516cc61879cb75411b150237164c0093d0fa6edbcdaf4e96815fdb4f7e87e4ea2cee8d60cfd488002b6459530eb682";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/th/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/th/firefox-67.0b7.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "750fc22b914dce12bf4721b3882c22519c325ef846017db29824afb1d67e87176e574c1ad6f2f3d9ffa5066c7de35207eab7ab654da83e0420e6c1466a595c3d";
+ sha512 = "0245154e664a10a646fdbb6cea2c565a4830a34caf4ce6eb86508bd96d7c6e95de447d4b023ea28f5937d6506b439f137580e059b9cc149f01b8d7d112caad39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/tr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/tr/firefox-67.0b7.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "b418750ab9f54b643c6adc9c9c9a67809dda04648005b5dbb1b0f603bd40798bf775551f8343831068a881135c624691d7177efaba3dc0fad48ba167b007ea38";
+ sha512 = "ffc35c836068960c96bbaaf1561c0d7260a190bf01f37c4f256d360747b52cc28d980c9fe63dd2f2a282f148620adcb9b37783e217ae0de10edfae3b08093366";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/uk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/uk/firefox-67.0b7.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "19475661fed75fb6dea76fe94838142629be2df25456a78ba7a546449685a24e7618d3c77a09fd2a06311155b04f96b1ea549e3dfcdccb3f94e168c6fdc729d8";
+ sha512 = "ebca303ac7b6b276596421788e72bea9b473810b5de4c9c6aad1a4631db560e4dbf34f1a938aeafe318c93f2d511ff7330a9400f032e9fcfc04be30baf99cb42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/ur/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ur/firefox-67.0b7.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "dab11bd3860fc0418ab054f76631283e9ec8e3a0add9a2b4002009b7e813e19f99f2f699dd794dd414380ad74466b968519f87befaaf605351d83f38ba976abf";
+ sha512 = "09462bea4096bea32afb94f79e9f20bb5c41f02b35a4429103389d3e8ff898c18ccfddb13db33dda4af8315b6acf76b24008b70bf0d3c8331e6e812fd924290e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/uz/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/uz/firefox-67.0b7.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "9de5f11a80c8752089a78519d24c82bcf55b5cbfa599b8e176df6c0f290d82382cabfbb0e9baf3a4b8b19761fac8ac34a807d62b94bfa0c478f422947c60fe84";
+ sha512 = "267c646d61be23f11e4139365b463c746b0adfc5ee7f3248c8f48c093e1706b468e187e574fd12330a8cb5bd062940eb383c9c6d42d0159f12b3eff6933c3a55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/vi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/vi/firefox-67.0b7.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "e82f0905a5781780d96e5a0e9d38d78a1e51fa6547a64896a7eca174139a774da106d3ea052346bd9ef3873909bff66e711c30c8de9c2151bc3aae0d58db9d8f";
+ sha512 = "4f4aad99ab5ac6ea231f0dd3384487c5577f9025d3e83e6960146435767e3133267495d781b04112c4a4734548d643310c6bcc7b97fa57c917798dc127f8a5a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/xh/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/xh/firefox-67.0b7.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "8f66b8667097e5545f6d9edef33d31e3a2e213b350dd719d108683bc3b6f79c53b3ef5e4c6eade455d9c77fd7f6e3e9c7ceb66fb52d591635f8165e660a7b285";
+ sha512 = "3c422d7a1089ac4405bea8268d48a56bfffa1c15fcc1362bad00f045200f2deac14bb31985cca2476a226998a55f2f6ffdc27c17a1fb7e28d667770102147fd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/zh-CN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/zh-CN/firefox-67.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "5b3053c5e7b826db8c2e5fb11cd29d3643aca6e28e890c950beddfe6be9789a5381b575c136c06b36c13cb8abd14cfb3d6ddc33a31aba26bd412e35fc45bbb5f";
+ sha512 = "b7d06b17e5a652c87a2b644be00c3ee6eded4b6a7daf79e7663d6452b7c7e5506971b819296b7c251a17055747e6b310e60ead1ca08490bba8d056df7424942d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b3/linux-i686/zh-TW/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/zh-TW/firefox-67.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "1fcfc2da45f171f923053b26dc01628943f0d25ea4e0c8cff1f71d58c11171388ac65063a585c6e926176f69d97a9b84e859513f80d08a1e3058bc62a8ab7150";
+ sha512 = "a5ef8efc618641fe7af9fd645388a6942ceabdd6f239c37af7776f753e3703802f707c64925e7a151d4e80acb2a720c4bfd1f8969db053a708616e0191bafa4f";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index fab98ad2e2b5..4262609c66ba 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -50,6 +50,7 @@
, gnupg
, ffmpeg
, runtimeShell
+, systemLocale ? config.i18n.defaultLocale or "en-US"
}:
let
@@ -69,8 +70,6 @@ let
sourceMatches = locale: source:
(isPrefixOf source.locale locale) && source.arch == arch;
- systemLocale = config.i18n.defaultLocale or "en-US";
-
policies = {
DisableAppUpdate = true;
};
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 1cc08f2630c8..8f1817627bad 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 = "67.0b3";
+ version = "67.0b7";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ach/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ach/firefox-67.0b7.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "6f92e25312b75b615e5ede81e7f32379f548e52aa37a424de1f2f5d67dfb575db2618e592a0652a93aaad4f1c789b5bc5a9b4e8f888c526fedc5ad885e1136d6";
+ sha512 = "065f94cf555016d4a4cf87ab48c93ac5dfddf3fe55769b46b008df89a6b8525705e3d1d42f1378b01c4fd84c0c6330fe213a8bbeb968b2062ecfb7fd0d99da14";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/af/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/af/firefox-67.0b7.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "e740e11c798dfb99b230839dd7d45cffc35df4415ab4a4ada412866f427c94409ad91277bb05ac5a2dcc098f287a87f6309f21094c76ae4f5af1aca72d1f2e0a";
+ sha512 = "f41ea86f9d0247f861a3f2f336dfb480706e114beadfd95d907335b6eededea46d4252e8b5f711b73e73dab2af4f189dcd1bc6b5f0430fb65a35b4df6e58b801";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/an/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/an/firefox-67.0b7.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "11fab1af385bab9579d976b5f621302f0a1e5aae66fffc983e8f3bed9f1419f07c5cfec942e39e81ab1e6cb2b75ddd597d144a2cb2a84d231d1eef951d81e8b2";
+ sha512 = "f22157f1c04b359dab1cd87e3f18cf2dcaa5bdb8bef504f4492b9be87288a6002a31997885303216572f2000018c4951998a68f9314862b2ea7c4ce7be943085";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ar/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ar/firefox-67.0b7.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "ce66b95022608bf2fcbe5e1bcaee92ce6db5b5fdd3383c3625316a35bc59e32e0bbd33b81faac5ddb92b34b05773185522a18495a46b80006163b07d6e12f6ee";
+ sha512 = "51ba06d4ca42fca5d5eb706ce3ec166c08967282d3b66802b11f41814058164ec71f28f8e4dac37affab15179c4e411b8634b42a5cf4693e9fa5186cbf0440f6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/as/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/as/firefox-67.0b7.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "d3c4c75ee9d7160accaf578d9651614eee63bd9d028fd832963479b98a824ccd3023a92a02a8e10f23a13454097f0dd054d6426465d8c99dfbdb83169f3c6b5d";
+ sha512 = "461afa6427e234f64fd95f8d6901fa4ad6e1a7aca08ac60205f3e27a8af55b0735fa50b0ae460460e842273f4488662133c1ef9d72bd14bbe69450f1c8c13bb0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ast/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ast/firefox-67.0b7.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "8c4d062f0d727b826a264af04d8d2c6b2e3830a23340a17adea743b60b1543eb27e043d38ad92cb206fa2c0964b3d9e4f0521d9cf79077238e6af9c06ab1cd79";
+ sha512 = "45bfaa2fccf2b2441a71ca3c23846e6cc03398e5a48202dd9f2912cca8f9c4623a1cfbe315d81952dcec4e8cda491d9b455a19743c32b278f2641828e0cd82fc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/az/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/az/firefox-67.0b7.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "6a6f323dfbc9750e0388e1497bd56a90918e7e0df37de987c0b11e24d407e221623a0a46a1f01645f1ce39494f912a2d53f6aa4b057333fdfaadf2a7ffafac40";
+ sha512 = "a12c0ee9516e78479413c5e79a43e149632648a83dc88e87b443a4163aae98f554ceac48b456845e881db575a87d9c8d0772546c844ff567d7ea6be1c51597b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/be/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/be/firefox-67.0b7.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "62027b9f2b0662f89c8869752961caa1e0edcc37a81f0a0ad04b37a434562671f7ea2b8aaef53acbab2e98f0b670af261cd73335da382e54abf8cc32c66cea48";
+ sha512 = "756723c6774e76f62f2447724f4c2ca350e94f81dfb9d3e4b64381d3d0e34cc81a7b56868aef1996e97ae13c15f192e83cbfd30a7b171a7536731d9ab9035eef";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/bg/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bg/firefox-67.0b7.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "4a66c203cd023625fcc2ea480614b52d7ddf0f0f02f56002b5195480f570b73899b0f924767620ccbb618a1cc3fad05252d22b12518931b29d3ba435fc81e2e8";
+ sha512 = "6b548c459ad6d0933733a571f800050b6e416618a0d465acbe251e8899ccb5b3d4b3eef7f46982c9f4f888f2a21aca4f9fcc990615345a6868fa45797f843ad8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/bn-BD/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-BD/firefox-67.0b7.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "a01d365a171c1822264355a1aa2e38e32345177b40356edd852b1d9a7e5a8250d02c88447405742392a2506c67f4ae5b364e5ca02c3c9243082647e1379154bd";
+ sha512 = "7a97d2daef6459cf2eafc7c7469c827c0fbc3fe241aa2a08865ce3b83b4e667f59371d33fb96e834ad1e6de29040146324359473dcca3c6acd2dd892e4aade64";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/bn-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-IN/firefox-67.0b7.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "0f8085a95d18b37c1fb7079af42fc365d7806f0b68c04285a8b00577853c77c69f673f442deb1ec88a7cee4326b6bb275f51ab19bea3fae09659b401c79058b6";
+ sha512 = "6545354d98ef743017e1b7b951df4f1d7149b9918a2b0e242c10c886cf193a542a8c94f3c98f491b3e5b21ce860cd14cb066a9688b375f435e01aa4b5d9692b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/br/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/br/firefox-67.0b7.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "04346fef1b76660543ab4858fb6ec3094dccee4f8a9bfbcbb306d88c1906ef6465fa10cba88d587c7d20a2c3963d123e60f18a5301952f64ebbf083f87caaed0";
+ sha512 = "85095550969c5708df47a9f0c67245273fd0c81bf831707ea99d07fd9e679d4ae4c12416b764599826f08329dfe7460c4c4109b21887fe416aec638e6730ca62";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/bs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bs/firefox-67.0b7.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "62fb42ab5995307a230d12ffadf898f3f73c7e31158aff69d02792f7ef4e08cc411907b7d6970616ff682413cb31deab99e7e6df13cd54cd841c03f4c385cc99";
+ sha512 = "3eddbcfd63cbf85f74a8f24b7cd1b47390369ffe4f89663178b6bf893fd5feb040c521814b2033a79cfb75ddd0201fce2bc3993715c50eb1a39c6889fe515a53";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ca/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ca/firefox-67.0b7.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "03431f48433c1c7699ab54d6ff52418859ad040f848ed6e1702ebe4d04cf621e9c2e04ac198cfdf24baabbd6e2e60dc95b5cbef6595cd08bdb8ef483ae0135b2";
+ sha512 = "ce4e8b99648dea33ed485aa364e99aa2b76afab2119a375c0b1beb6acba52bea6386beccc00db84692817ebbc7cda54bfd39755430ad195f4a409d24b6f9cdde";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/cak/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cak/firefox-67.0b7.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "c19764772599bb69be4d432eb8c91349dfe60a9c0b2805181eded7f9bc5586941cdec38f1e5c7fe4b3667da5c76272deded6e6369194f84e201761638f7e03e4";
+ sha512 = "1cb2eaa6c83bb7c8552094f2b40a710b9e00b48fcc9d76b95ae650834e8f4e33b898fd1e3fddf3e4c90997ee9560e1876acee2a763719bdaa2b98913d62bb073";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/cs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cs/firefox-67.0b7.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "56d6915184fc41ce4efc2ee067f7189566754af20c265bba3a74c3c9ea694fa5141f0cc67b99f1e1ad91b2c39237f48e920eaed4ca1a98a20dcb7c98088c6437";
+ sha512 = "b4212d47a104fa1a1905036886285973250c6b7b253c7b8f1d75a02561af2f7a127edc153ee47f1ca386f198d0a79106ae27c4abdfdbad05fcaac5b179aa64a5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/cy/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cy/firefox-67.0b7.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "64580166832f4852e82b817a0085f7e47c8af07349b1f0c71be9cf95db05b0fbc4e02f1f253ffe21280c66c240195f7ff419c38e9874c5ef66c240c5a0a8ec40";
+ sha512 = "6238a0f598da4b323a245c7f025e0e67e511c8b07f7f6fa2dee5d7fc232fc9eb21d4a0c00d3b5d9a4912cdbe5fc3f50ed8c4125e7e6cee5337d21580491a31b0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/da/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/da/firefox-67.0b7.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "62cc7967d2661b0c213a36a0ef693968c96cd2196be33ed0e49f14ee4bcd2aad4b161d517f8289ae4bc918e2b0b4c0e964d13287000018b5137a261765dd4b48";
+ sha512 = "f3e5b994100272063fa50ce90edafc913333902431ac24050b10ad96f686516efca6501260e2201d6fd8a8b835efaa3f478e29a8337040f5274056bca1e4b893";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/de/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/de/firefox-67.0b7.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "08c1d2dd9370296e5b2e325c3b1b4027af3c2d003f20cf1f1e116fcb98219b01c69efbe9ebadac5eb73c5dfd863cd838834a349ae338db630651dd1efc99d244";
+ sha512 = "b85685a7119e9b77325cbd3091f447b1ec2a65781b398fdfa0b8ce6c0bee0b40acb67b8922626fe3ded23838e4d760a61b9382671f99ab3d97b2cbeabc180759";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/dsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/dsb/firefox-67.0b7.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "3c078ffb4702cab4580f4d36c95df33d6b196d8d9a53e6d9df8bc38e8b78b2857103b6d27c52f29499bd73006f1221fe9bf8862a0df935e38842761e2009b5c3";
+ sha512 = "16c488a16b880441e8f24f0dce65a4e311a68fa6f1c6bc137283213be938518371963f2bc4e04d56adac25bee86223018d8701372187a8db81d88f24fa32c26b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/el/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/el/firefox-67.0b7.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "4a8a3ffc7a6649daf011e29d52ca1a6c6a8ab710cd42cbb93fb86ca2a21003f7abde7e2adc0dfafae8f4f7f4b99884da4a15e278be9563ad841de40c01c8ed72";
+ sha512 = "8bb987cc8f2d0cd5528319530cbdb8efbdf8ccae4164c376ac08dae9e3f94460e73c9295fc7da0a0f88f4bc39f8b9e576e3462edf15c4b794f48571975c9442a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/en-CA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-CA/firefox-67.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "74cff19eed362cfcb474ee5b2a38f65359e5492d533f71e9bcb8d1a0d5406f4413abfaa86eeda39a24f54a9e8df3b1c5f1345ece330698eaf42a5b33911361bd";
+ sha512 = "b615236a7c24d4d45bdb7286c820df4a96829ad2afea2d2f3ef9f539f5841b5fceb90790226d61db393e7c3b7e626ed0c4898e146dfcbe35d468fef8f18953d4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/en-GB/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-GB/firefox-67.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "4f5a5e72ed82fda64ca0e27e12590ac9e860358314336f4b8c40e86130667fe32b5a907462e7e8018d9b5a0eac3f66df4e13490253987bd734910adb1f1c5f65";
+ sha512 = "d658c78001a8dcb6ed58d63205b9a845b55a668299e514fd948245341b2aaf02da7721e7312e763b38b02e8375d20a98abf3d3714f75236fb0bbd3074e08a3ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/en-US/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-US/firefox-67.0b7.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "5d6c40fa2d8c4554965a1b833e0a4daffde53024351145c3e2cf603d16a51885056726851d469edb36e330dded5dde12e08ea98cbcd622c9e38c4400d4f6b2dc";
+ sha512 = "b1911ac01ee72cf64ada7e8b8d983514446f174785927f20c88e15e4394f4aa57f50fa916295e5223cd67cca0c3c8e13488242c10491ff05d66e1439ed38486d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/en-ZA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-ZA/firefox-67.0b7.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "3290373b1ee884160582bf8f578a91bbd740ba984c27fd658a1808985e0d0c93a5a87ae4928a100e59c5a2c8134f0ca3fe717014acfe9c482f595bb2918272bd";
+ sha512 = "390815b14e35134377cee24bd5731914cf4ae08f12206f2a3502d12c3e97322763c6c5a9d05a5b0b7f8e85247d5d61999f499c513fa8c3033aa6eb0f22b0eff6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/eo/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eo/firefox-67.0b7.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "54b1265f1de4cc866cc414d58a7e599424a58d45f3d9959b6c51d5de6ef700b830cfed2c001fd9ba632c13619667483a6a78e2bd18df25587f073131618f47e1";
+ sha512 = "b80d91463d9be96e29eab4d15ec76952e7c664e30934de1b14d165864962c4aacc2725f08b6e301487c55e386f324a3072c3969bc4f474d7120f2c723d9e76f0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/es-AR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-AR/firefox-67.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "1096be162ad84cb342ddf042dacd14e2dd2e1c2230b181a03ca17b95657e0b1247716dd285e9935d9a661962143407cf3928e8875ac375deb81c6de1ac7ccbf2";
+ sha512 = "03558cb0909a4f8fb2076b36be023cc768a84de64b3113d9c795e763cb762b68378826d1fc8c30b77f3c0e55d6f3ed6ca2d023b531084548b24c4a9bdd4d41da";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/es-CL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-CL/firefox-67.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9edac158d6f5261240212335fe215693809689cbbf8a6e55b3592b4e42b907621e0b1823d469253b879193873ffe3dce28068c96fee1170735b0383c6a94475f";
+ sha512 = "45d5284a78cc6f985d3fb68888f9a03b155f924549f43e4364deb87e0dd0c2f9c532e8a0b8062db8d265c810230956533c6b7477d66f5adbce82779f6e55d0df";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/es-ES/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-ES/firefox-67.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "7ac79d8268ecf61568b4bfe251e86da8d0a5ca3df806531bfd1469e27024e10790fa7856477a419fe9972f64edb83ef3ff5dbe038c8cb0788ab93bb69268bf9b";
+ sha512 = "650c869a200ba5891be7b377030e32ea8e5c5e1bacfbd9028ad6d5909651aca8da7c82b399ad5491b071cebab168cd7ef3f14b00b8af562a02ee5696dd29c249";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/es-MX/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-MX/firefox-67.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "53de9d03e23cda6235b834affa93a5a1806257c28d33bb16733718796a19b0166fe1aea04b3c4a8defe276fb268aba58d036bc288351c788a190cea9a400a214";
+ sha512 = "4fe0d5ee804dcbfd9b99f658af522be71acce6e9a9bf96ecb47bfe8e8327d1bdefe20c70ae474cab3ef7b1007ab339f6ad4ab4250e9f985e885147a039daa83f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/et/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/et/firefox-67.0b7.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "6b169f3726d19ade972490a21dc0c9d591cd6e68b541a370e450d4a8555f15681b55b8b949731b20b37ab79dd0fc152143fa4bcf32a4a8063ee079b2e1f34e13";
+ sha512 = "d3df04eacdc53b02f2a78314f086588983b9ada6855604337e82a5ed1e0046210e2cfd37153570c46dad632ac066bc87e19794898144ee5d78cea0ecef1193e5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/eu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eu/firefox-67.0b7.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "6f54e4bebedd5ab42fb5f7dba2652b2eb1b430041e1124748c903c51cc3d7e432c08b8d80111f50a3cfe8b373b280b833fbdab7074c53b1b839d5af2c0042257";
+ sha512 = "b0bb4cabb709ea6dd66fcacfe0536e03d9615bf94ede192bb4aa6f84592b94206be039909f46ba37397d9d396b08f8cecea8e07c6b64d8578280026d89dbc6df";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/fa/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fa/firefox-67.0b7.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "7126be3ccd3ecd5e4b67c2d79bc6c9a653e8111b30cefe3bf59104519069f9e92cb8343021f3310c578bc299c09b993735120da5db94816cb8a88e9de7b5dcb9";
+ sha512 = "6dc15ce8ffa1839df3a9aebc160022cb3be335fca06b41ee87190bc4fb8fb78be4b220855b0bee75efc771d1ecab3080116b3440b225f2e15f20536f84f2b111";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ff/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ff/firefox-67.0b7.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "19da85777fca5b464f7366b86557335874578f5701b8423604eac47fb75afbc4bd90a153b1a7425d55b183b61863c27679375cec492d442e76762d8ffeae0b59";
+ sha512 = "367edbbb90d98216d3d5ea457b101e4a0d682e36961c87477be887ae1f7b0dd5efeddd81e12298cab2e9c2e7a9ab1560288263857e79ee7f561a84bec3eadeab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/fi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fi/firefox-67.0b7.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "d4be2da403b81fd4ff26b85e9f6d61281f675606cd359ec7ab5ffefb05a86e630e9b4bcdb63900cbb328e8cd2dead109839ec8d863febb866a4dda2fa5785727";
+ sha512 = "3a2ba7291fb2efb95663dc01e488fed254045b9d23f84c896a29273c825cf5f1ec5883aa66d2afa0dbaba3ff6cc9b87f14e845010073d897b8dc275a47260ac3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/fr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fr/firefox-67.0b7.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "99793c8e00172c0f80dd92544db7be826d365a2b5fae84d493d567939cf484b25e4d655187e715d88eb942388aa7d693284134cc48cc79059f3758875c5d9a8f";
+ sha512 = "8aec13533118aab96aef3b7e7e23b65a651d5211346c1769f649128a50ae13b2e5827ed6195ce265584dd3f63e956b28689b60f807ceaf63d7bc558d5c5300ce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/fy-NL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fy-NL/firefox-67.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "4250d8e9725a2bfca3db347300e65e710f2befd58f9f5975f54ac7bdf3b6da44bb3de49324bab337b587537c9c3b8c237530ced494fdd2f51e749a29201928e3";
+ sha512 = "593f36d08d2af14243779f8ca8223b9e00809330f4012ede586917e98c875d39fed9aa856caf32f8afc6bf14c47ca6e5db0e0a8c9897767c97e9edd60558d229";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ga-IE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ga-IE/firefox-67.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "d91b27a37efde6c6d92ee481678fb6de0b21f8e5d3651d8ab3fd1e88873f659d59ea34d40bba508b3096588d277d8ea9bf33c058960ca00e3fd048892e9cca49";
+ sha512 = "a272716be03895e1562373ab93abd0c4eb2ac3e8ad5caa1b868607faf125167157aeb22a652d2edf4148c9096178acecdaaff7dcc13e993914e4e8ba899f31bc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/gd/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gd/firefox-67.0b7.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "e51b80ee2ef1aca1eb4ded88336fa70dc16aeedeba1da8196f03656a240ca033df66211d160de8354b48340cd27731cb36d362ad44dcc2b1167573b0a9ede396";
+ sha512 = "3eb05e39c33873a7323cfe966c31cf1ac073edcb37b6aa37e71b58d29e3dea87db8a4d5cddf9bd64e618e2cb2a3a2314ac9e9a5cd23f099fe391dff9bf7d5bd1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/gl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gl/firefox-67.0b7.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "ddfe71a48bb7a813f1053f569e7a7d8c0de9df9ee8ac79b9bac4e3cf6fb1c8b2a0da622d4e8dffe8e729e8eda33587e1cd7f88aface8ede13554d516f57569de";
+ sha512 = "078113798dde9058778c334b428247c83c95030c35b4964bc1a3b70aeba9d6967338c84f0b88873bc95e2d9cc123eed669dc7cd5345ce81e0ad021ff0e432a49";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/gn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gn/firefox-67.0b7.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "73d4497fff9d4b9daf4c729d1ece5b9723f764c89251f42ca2353d4681a665c4a7978ac367b87b452247e9480ca099c89e7fbd0339c5051667561094836f42d3";
+ sha512 = "9c5ca6da7eab1cec26ff66649f005b77523ddf325869236a166545c7e0b50522d9023883f831dbc6520396a146e415a458e3528cc96e12d357ae5286dbcc932c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/gu-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gu-IN/firefox-67.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "c2faba90a33d7d66bcac96c5f8f03de0957551ff844e48d291299876999c3ebd4c9b3b74066930eb4766be3768f119377725b774fc2ca2a51b4ea26cdc41ed70";
+ sha512 = "1074f26748385576f096927f230f4363fb28ee21da467392c23f26b912c6bbdea39d0d816ce60c8bae724b294e979f01662e25f9de9d9801c815bf3363bbce8c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/he/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/he/firefox-67.0b7.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "131be19a8eac0888c1718d3656fe67be0d400a50def8189e78dda181ec8775584803ac7ca640aa37b591dee814eb56bb3df375d6374c672a4d160bdc59052a6d";
+ sha512 = "9533939e4705ea4ab9b111fe4940c1e875824ac53b1856ad18c4a412f9f8d60d1befb3ce363ae128fb74ad1328504e7a34c20906862ff30e3b83f18535a49e1b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/hi-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hi-IN/firefox-67.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "54fdfb3faa99f132853cd7875b3700a16391140d4a31910f853406b9bbdd35c1fd3a431410e5c99098deee9e7874d0ade58c67327d15de93546bec3b18070cb8";
+ sha512 = "af50bc6a8951e51babc5e9c5426205f218dca19833ce65baa6b7898a5b469c41129499d094ef8dc0759f34b09dbf25861dd32d97de934548c2713a81f8c253b7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/hr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hr/firefox-67.0b7.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "80543d41613d61b2483c7db43cc806983f06f434d4efe1e9ce9144b804e0d4179f67b8a9f7ffb7dc507fbe80db47a1edfbe0b8af8f4d4824b751822f43de2de6";
+ sha512 = "dec21b5d230caf1c1be6e712bd926ed1eb6b74825ae0f07f7c6f39545d0419b71b57c404ecb897d11d9f54f08cebd236dd5d77d9ee1a64a900914fd9158cf4e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/hsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hsb/firefox-67.0b7.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "294480baa247e5f46c7dcf7ed461d196cf8bc5ecbc5df4446d57da65d786ac316090114e009ea79be19e102264e85d272ea5872e520d60c59a82251420ac5446";
+ sha512 = "023bde601d59f9daf8daefa1f9894ec43fbb96a7ebe5b31776a288c07105b3ee10b5972c5a676e04062acc81e8d850424b8e7aec6b8ac8d9194284641768934d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/hu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hu/firefox-67.0b7.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "cdeea61b7f62898a0f971502c7899bac5f7ff26a68a9747efc4a6e1004398ac9acb51d67610751183f3fea03a0df1b2153007d442080959409f57b357ebe7638";
+ sha512 = "d4fdad7244ba456012e36b64149ef5f3d52b5d139bee585b57a138556ef1f541908a24cd97a1bbd2ef2044852b9c3e7abcf0f634cfcc18a0b44765a3c78126ed";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/hy-AM/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hy-AM/firefox-67.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "534ecf1e57b3679733302a115809c78440eb13d1a1ca0b89249df22680790975d1f1f055e38e77eb67019fb65a938bdc930df1619394ae4daa5eab3e10512439";
+ sha512 = "4443c51211b8d2874e4cc8dff770c87db4291465ac615d087a9852c81b256e47599fe1e87d24d2e3b0145d68e47e8f128158f89bb0d6bd9baa92615e3b79656c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ia/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ia/firefox-67.0b7.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "c4f0134a80b8489712e372371e09b2366f37cd35a7e51269f0a8a7a44693a0fae239e1e92312ada3f4a622ebe988752d8c616308a0c116964f4fa87478e9d099";
+ sha512 = "589f94f2b4c873fa43896b57148ca1a7e16038b71476050754a0a0374bf0abe97d9d8ca0208f0101568f9fc1cf441e439817106cc3d68f10a0a075fdd455f89b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/id/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/id/firefox-67.0b7.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "9477c048d306b30976e80d6e990d4352a157ffff76d036490dc6519d71b4c42586f5f5931c1127917ae33755f3d3f7526f6a8100d874646c2a3021c2a6801b09";
+ sha512 = "602f2fc520a61267f3b8ffe011d50b2e3c1abd4af0e805fdd7a1ace4adda69ce00cdc6b0feb26a46360711e6bf49c83bb33e01b0af5222a71456234119cdde5c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/is/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/is/firefox-67.0b7.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "81217b9057d40431f61a241bc5356d2fc4e7e111a8f9467847e60e9fb14c5865c477754571894f75213b8011b504d941fce6e2e6b5f419c18e8c985802108617";
+ sha512 = "162b3fa20530f59fe80e347f068bbd8d7d370a23ee2b3f4582c181ace473cdee06e9655ef08dd6bf514df728cd79935368bfab245110b6d143634be252f84e8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/it/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/it/firefox-67.0b7.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "33ffd210e3258ae166f22d2ab6185a29ab4a6b27a52305bc46c24b2acb234ceadc39a648850557c8618ece107cd9158f55c092cfa0dd019db7475d2f62155593";
+ sha512 = "6887b97e91954598c0ac214b5c072ccb5669a200b5a38875b6dd1ea546b14de7dad9639c64b4b49d3039fddbae22ae7f58b0cd4f3e243c780a1a65ea831181a0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ja/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ja/firefox-67.0b7.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "b580d86e5edc343457396977319c4268d8c3f151d9c2ea335aab8b943967f2547fd6474bb7fee13c7da736997f2215e833d37478b3558a17cace07a195a982a3";
+ sha512 = "194911f101d7eba5a7ec2325a4b4accd27cc26c990255e73d9aaac9a281d40b6bc38091cf7cb138a6ff3ec083639a41b0aa2b005c39f1f89da79526ab3ff2349";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ka/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ka/firefox-67.0b7.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "0966a2ef7f5719394664bf3d6a3e05e725cf041f658a84b182cbd4a94478c2f88abef2cdf13af817effe22ad93a21233f8860717c61e061e11bf37c8d490efdf";
+ sha512 = "d8804f06b2dfbd57f316695d5dd5350e3057fcb2da4e3831b86b6aeef2e9b558d791f00ada3578ae1c7e51432643814c0394922e128fa8fe9da1604edc84ee1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/kab/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kab/firefox-67.0b7.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "6c6108336939a2f1bbdf09c4779a87844e9c8513496adb82a7d4a78c774685aa1b06ccfa2efd327be12ebe41bf6a86fd5b55dc6abc134b5fc1ee2447927cc234";
+ sha512 = "ee49177da5ff8b91458b1de3940494d7ac503b7c1b752fcea2b4d2f66d4bd8dcdcabfc5b898a34528ff02ae170adac3b48db4aed164d955c4e146df9275fe682";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/kk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kk/firefox-67.0b7.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "1ed0deee8306c43c7901ea0cb20682de3f39fef337a5b6af80754426218809a8c6d9375bbd64163aa4846580b63bad8fc36f417bbae435fb10a8ecbccdf18b95";
+ sha512 = "04db9af4da7b10129d28d9a67dcbb233e2a77815f3bee3a8ab9f139020c0876c99c856b460ebeda07e3a5228e9c3943f75e22ce4f1d8a61ae20c143f7263862c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/km/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/km/firefox-67.0b7.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "0c4b85770b63cb3d23feb65e1652d8c0784892037be7595b117699a2014e30a3ac56e8ea025df301877d41240f9a60b9bbceb26b19059fc8fb6dabe12449f8eb";
+ sha512 = "2fdb978f01b44f81041bb3a829504634ddeef593568dc31bfba712d79b96c43d4d4aa95d8a989312cf758d72f54086cfbb0e6a4b1ed705c666b6da2e5b54dc7d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/kn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kn/firefox-67.0b7.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "5af2c4ba1e8733c18211c02dae32ab3223d25622fd4858e15e5b91bef6b88923462c1593b1ec83049640200b60edfcf378364bd1650640217aaa5752cb6f7c70";
+ sha512 = "04686a8b7ff088f1f65087c02c1dddd05005134a6d96d69b649364e4a93db2ae2ab0c1512d37141099d6aa41d6ed51aa26faa942c95cdb3cfb2eeb279d12e99a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ko/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ko/firefox-67.0b7.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "bba635f50877392506f3be5d5cbcf10ae314e1db09ba31bf0ab902bd002c2daf554dbbeaa7addc2f5796d1f16731e59179b856773a093765c95fbd0fe15bc72a";
+ sha512 = "a798b80f716300ea8211470db9583e326029eb46da217f9862d7deceb3c8f418f09e9a3a355a7ef0b8da3f502d6714571b7a3a0f0177fa5afc565d3df47b6cfc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/lij/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lij/firefox-67.0b7.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "d2f309827de644d9305eae52c090f5a4ba152f8dcd97b1f8e7fe8279e9cb79f9eacf063886db2756eb9a6fc82c3c568c34b31caad10940f60a9d6c359f9011ad";
+ sha512 = "693ed9d8c28b7401606de9f2c45c93988861f1cd606b5d0d1f9bbff31f367c603f8761b24508ce3d1d5b533a6bd9555a33827b531859262201e6e187e60d5209";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/lt/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lt/firefox-67.0b7.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "305f2f1736bfdd499018e0ca7c319c0340ade19d85e76d8993d33a083d11689760ab1a2a6bd721d3a96ad25695b013fc43cf27ecd625b1b91ddef7390c84405f";
+ sha512 = "291dea291f6bf2c9c0373f8c342e000cadd70ae2d4725c833e63bd99a5e0de5b8ced26d445787900086e55201123503ce850f9f3d481dd1fd05dccd5c66153e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/lv/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lv/firefox-67.0b7.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "66b0c9c1c0eb30385e2c5bb67a5535a86b98bcc834dc7e019cc0d5e85b7645eeffb822cd9720fc80e7815aa0ced526921097c5f112f554a3b3c072ec6c0b9839";
+ sha512 = "dca344e94c86ee0ede7f993696484eb576b54a71da7151be9ee40540d9c8c740d399840a5c024156660f2b9d6a73c6f086691df9e3b59dddd653d5a25a8ce1ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/mai/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mai/firefox-67.0b7.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "cf2210da8f1724306eda52d5c7d4c10aba3d586b564db1073596bef39652ec8dcffa7a660d733efe85dd5252a5055ef04bd69c7e89eecff72c38c56570e6ecfc";
+ sha512 = "ceb2a05d4c051e31fe1969787f4d2ac0e73714e45c233cf40045cd35ad751d84c064afab14ac58bb976140976a29b9da5d40c91c1bacd965624667c5fc62294d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/mk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mk/firefox-67.0b7.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "46843427dad63ff55b5c28329ac4ac45c6d24862887e0b1da96ac1fb5c7b71a888f9c1678f7c2222fa974695b1b52b94c460d72e069e46ac1c832f315fe2c245";
+ sha512 = "ee1fa59d256e279c08a4110ec0f14e64f80dd2ca02ff01033bb29f0336e49118c07ec93b0ca8bc318356dc62fd05d9bf3201d9491ac278a8b5a836cf6310fe04";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ml/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ml/firefox-67.0b7.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "86f33f7617702572c595149f32351fb55bd9cfd2849738e3bfc9dce00a93cb2225d9350f871e6ea4c2ead3fec95bb0f6e5e5abf8e43c9ee866320261f6b6252f";
+ sha512 = "477d66f1c875c53e678ccd64a666b64fafabb8b9cfc6cbb11dc33a14707d7a90758f8a42a855020f650e59b1f55373208c3cc96b69ecafc7ac3937eeca00c7ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/mr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mr/firefox-67.0b7.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "53258dcb4942f05b09ee88e7cee441afbb40598ef295ad1aaaa54023b43fb670dc43e2f5e2c4e8cf6d22747e4ce3620ffa7d998f6bcf99a82d4c572bd275d726";
+ sha512 = "06cfe20c7756d6786a7cd94677f83aa82fb1cbe83245412d087f7ff06372af3dc9ce5d2f5017838d74cfce864e0405c5abec417924feb26fb9b9dd7298f833d0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ms/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ms/firefox-67.0b7.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "3cfce6144383a66bd2c1d95bfb1303638d4c8daf037d50fc64a23c1471576e9d3a6252ead3e2df12963390b760f557f877b3f990106a14dab0c855b735cfe678";
+ sha512 = "d0bbe9e5d7dae906dd7140725873126d4583c7e31f3bf4a3d0a7716f5af46f5b5eb65aef3aee32e010e1a82ef59e279febfafb08458c43fe9e8751dd1ff68e81";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/my/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/my/firefox-67.0b7.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "c8fcef429d8c32fb181534231b6dced9254691bb7ff1b41feccf0d0d279332f548e91eee57146560d1f6d6563d196315f3825b40962e36d3b5c5127c064ea481";
+ sha512 = "073aae70db0f59630c16e13c91db7c2a7fdb8a11ccf56843fabe4d666751e27d369e1d57118a1e385b8586d3024ffb3c90f8f61d7bade807aedd6f74e92640b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/nb-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nb-NO/firefox-67.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "ea5db18440da59a88b598b0f6a476c16a99b302a7c68c063e9ae7935454d7f8eef49d42edd2a15c7d4de1c23f1c4ddaf715f28d42422c72f64398efbfd89c5a2";
+ sha512 = "bf4c6affece8d031da249dfd113f1c2f7507a8b4473e03daf5a44e7c0ce71fe6caa4759f78ca954761f90bee06402f7f5b5a9f785c1785f973feb1294947e0d9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ne-NP/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ne-NP/firefox-67.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "af70e4841f1a88f6cb8d6c7d8c280438d8a4df7cc33a32228848101efe3e06d27e2f6d935c5a94de37dac79a4b0506c0c486b0c3e7ed38edc8d13ceb8c697c63";
+ sha512 = "16902e80be172af3bc8a2f02821d9e738864f593951619159a0c362cebf0a5827b1f3be9063c1429db8b1ad52aad8923db8053b6367d21bc97333ceda0899d25";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/nl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nl/firefox-67.0b7.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "fcf421026b33dd00e3e755257b37d634f28857872c6918169cd1495832c4249bf31126349105eee573b2e591cdfe6cd3551b03b3e3476b5d882b3675029f4488";
+ sha512 = "1ba6650ba4140d4f32391f7e05577379a43ca5ddf064ac86c93c633bc1d78c6c84e6d5c4227577dbbaef4d5bae9173861295805e1cf559ac25fea434db2df578";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/nn-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nn-NO/firefox-67.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "1e7a6e228e2ddc9d761b5b5748e5c7946f17076c190175a782bc3976631692153a940d3ab3659ab9a5214a93563831fec61691aba516be8481b197ee5c84945b";
+ sha512 = "860030e55b0c514ec4219ec295a02f2ab344bb87e31292ca4ad11501c02e9eec3f1b82720b7c3d69c043ddc0a53fb9ff3e83b38d4e0443d57849d68bf98b0e05";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/oc/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/oc/firefox-67.0b7.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "3168e101e8c5ab1f681bc37d9e13fa80ac444a13eef275c2e8b97270f57cda4ece01d47c62145ba01f32c257412a6458c554f838e6a5f94879874771da6f2200";
+ sha512 = "33de39c5c495d0ceb5e1b65fe96458887d0a918681504c7c6a561359e29b82a7026673516a5afaf67717ecc0aedffa8acebc92b4002d160924e87d401e963ca3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/or/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/or/firefox-67.0b7.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "7cffa469fbb80f882fd26d177938ae874c3f6199c5f5d1c5fec01655800c0854aff5f1cdd6581a29a851317f82bb5ed67e250e2af574cfe43e3498c5cc31be73";
+ sha512 = "a1deaf9593ba66eb3e2e1a019ccc8a3b5c7455b0cd250d6be3708971406148404a3e10f3d67ca5ba39a25c92d27006d1196e11e12f8b8c5cca518d748b5c7841";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/pa-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pa-IN/firefox-67.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "972a5d577feb6c43a35d728852a581112f7e617f05c859b8027bc00d01765da8ff9a8efa40750ea786fc845737ddaf12db912372c8438a3a4f01a39abebbcb42";
+ sha512 = "35df203d2c9a892b5cc4c9d12c10e7203f466c949f382074f550a45df54f670168713ac096ec085cb835f51f0790c9af2a88786d474a0dbcd6c8041d2a1a1244";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/pl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pl/firefox-67.0b7.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "62d612019b6462647df32312f31b241938e436fbcdcebb4af9bd0060ff990b6d717bb0d9a511e6b38d0d34b5fd346a15475d576197a048487a0b890e0e0550a4";
+ sha512 = "81b08e3cc5e2b7dba6110ebd455431fc04df6a9bd54e15f5ccac9792b80133d9c8ca4b59746189d5dd752b48e4053ddb30dbfb01f3467617349eff8dd7de35f9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/pt-BR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-BR/firefox-67.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "1c82ef4401706826e82c42477aa288d7ce8e0133527f4c6b21ad30f507bd5b3044c2fd8a5503c5b6f784c366c8f47d29960eb5e95e4bcf07077491d14cd5ce9f";
+ sha512 = "821bdd23cb73437898dc2fe570ff5a108a2a862b2cfd97d1427cd235761c5d24f6db33dffc32c0080576c72a9f1b2def8c7d398bd3ee354d5097b58731d74ae5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/pt-PT/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-PT/firefox-67.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "142f0a79261fdf6fc989814f941aa7c23443f84e2353f92fb23518b94a642d04255013c6565a952063f966e4976e1013561799c9c9ae13b6a0fe9ec4e084e07c";
+ sha512 = "611b13950d89e3c21a95c726afba58201f4be46bed6c16bf3c732400b15cea50860cbcefd98ad83ee864b8bad9e89e42b2bd075f448ee8d8eed352fdebe176d9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/rm/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/rm/firefox-67.0b7.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "0a5f903de81cee3d42f39f4047f8fac3ba09d8bc39c620b8ed91b5b9e6e95c9996d8982daa65cc7a64ea2118890b2df48290813ba16ccf769b30c3bf5202c7f9";
+ sha512 = "53cc28912e17b5302489f0f4a89fc4ab53edc319a8702158ee7ab0a0943b4c619ddb022a5549a0c4ee2912a98f5b695117a991bfde2f10a9036196298334a208";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ro/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ro/firefox-67.0b7.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "6d1fcc23ac8e8aaadaeff509039f2c2420125f45cb1c3d7a9ca8070dfe1084ddddbd95b5195c9ae370bfd801f16b5cd8060ea699e68cd7d3e08c4486d60af350";
+ sha512 = "50c753c9cd79bfe6d9b8564f64d275958b7e44823e4fa5575bbd784ce4cb4f7b1c3c71fa962a8a26f1ecbd1f2a12f108fc7505659be08063d0246ea29488a440";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ru/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ru/firefox-67.0b7.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "a27b6a1d331b870c2369fd88636c042c4f8eb6e1d5ead902a9308b55530c25d2ea07550c806ab4e023806c61e204ce175ae0d744b8d6b67f3edd28e1b09092e1";
+ sha512 = "d739ceef1bc6328ee17187e54e3910e1746d516f2e21f03319863a3d564be6ea348c87a8ea9f302b692c99b16c242578af15788082e121b857a1a089ef0c7549";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/si/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/si/firefox-67.0b7.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "b5db77c8cc860ab67fcbbd8d7666db1a8f4e6c51834bf4178d0c79023d46b95074b54f4e04d93373942ece875dcf3575ed4d56846dfc7aa9bd6e025120355a7b";
+ sha512 = "35a4cd2e1e324a0d8e78b679dc5b55b1bbbe2e73a9b37a65cdb24209d9eee5d52de59b3656f2fb65b6f2513fe4ef70027cfe5e9268a103df95510dc673eedbe7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/sk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sk/firefox-67.0b7.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "f6fd2829ca5a1685922567db09c619b0ed85c03b37e7e14a12a2ec031999ad8873ffb78c49727562a72d73daf0fcbd497ba944b644f64e5759d9af16dfd9881a";
+ sha512 = "4ce6acf4dbf83010c726988eef0ba90fc1b54aa4213e4c335446d632dc99a4f9646954f45e4ed143a132802f10db8a68a6335ee4f855c65c4adfb02dbeca4443";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/sl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sl/firefox-67.0b7.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "4e014c4e5ea0410986c4942efc93a02a87512b0744f65aa68e46572c22494f4e49031e56ff4e9c02cbd2bce7115adb19baf2692c84902a74949e80db8a2e83f6";
+ sha512 = "097dadda67b70b58244020b4a747dfb6a9a638552b2387ac3dec1130fab79e156bfbe0e4dc913e1669420dac827ef0efcb639560fd5366f8829e94456b2afb74";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/son/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/son/firefox-67.0b7.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "09e79df45a4cd207179e9588cfd106872b93209a19281c322992f01e427f7cb0f90ef3e232923a69042b149498eb0b5b7db4ada0937a50c65083884f29cb8b09";
+ sha512 = "c01e0d7d45bdc5eea290c939a906efe18720e4f1fc60dd33afb5252f59c90bf40e227f1392212cfb272efdda6c1ffda14ab617d02332610d0f890f886d053f0e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/sq/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sq/firefox-67.0b7.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "e05ab4911a66c1c19dfe73a0097c5d11acbd5645ad71c44d2a7ee2c85845483a57f00f60f32cc39d6f5a2ee0c897671c9c994730c581d588c48091320b12a9e0";
+ sha512 = "68020ac5ad6035fef3d58990718f14cb4175a2962b850b8ba98cb5832a169cb72c4eab9036da693b93faeb601ac0f35ae23b80d748be0dfe4d0414b51571f6e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/sr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sr/firefox-67.0b7.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "0f9120b28b53c3a0a05dc112eb4979e28291de7447411c014719a0d922bf135aabdfb79f8e8ee35fdcbd751a103aa60cbe3fb7e42b5e376fdbc6c75cc7e81990";
+ sha512 = "ce18d0ba989949e79cda33eb4ac26a3d7588acbd511e57c9c31ef3a3f8011b7f669cff02e4b0405bb2615c18e600d75824fbd556519dcd09616fe27181f87748";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/sv-SE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sv-SE/firefox-67.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "d50930865c83fda9070d3392df4fa6bc2f76dcecc98dddc2251180f2ce070cfab5aa4c661e2a27311e94543dd00433113b1603e0c2d90d919d6d9819f2cebaa1";
+ sha512 = "96008e9c2ec4b8cc3bc646185a502cf26622d3f4f2d9b23ad02a963c5e4e5a1b98c1bc2bba342b0979c4b9e079c22a9130ab322d27d0d469afc02a41e8f3888c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ta/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ta/firefox-67.0b7.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "84813aec14978bef5a2fe13098269fb04bf55a182eb2d5ffbcf1420c60c446c7eb065be415c8f3872f0f360998fe129e46f9963f44150db3493fdbd0cd66f241";
+ sha512 = "e90c1bcb5326d3823ac6e8c0bbc1d3e98a5911f870d791af42a7f6aa539c95e267eca1248df03567f7e09853178c40c428b3cc04bbaf15553f1cdc028194c60d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/te/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/te/firefox-67.0b7.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "7b14527fad8437031f0bc3187c503c453c202fff3f011b0670ef356ff002da1706c1ddf25220835bc969609da64b8b7ebe7b2ae3eaf175797c57c8e118f52a1c";
+ sha512 = "a5a04abacc8afec69e4d865ed89f0f029b623cf24cf05d275ae79dd292d28e5fa000ee9fde4325144e2a7727d0be5929c9f7c30194eb802b35efcb2101422e84";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/th/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/th/firefox-67.0b7.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "0eb2d831439433e27ac572ab6e440748203ee2bdee2531281f5e33b42868194063cc0721eee86c4dd1b5e600d883513b739f8f75ea30acbe50d464d5e4e660d4";
+ sha512 = "1bfa1ee19141416707afd13594ad94da0e5ad5bf71ffe098109dd093624531a438df3dc3d4da603821d29e139a007923e367ce6ef55837169b49469ee030e752";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/tr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/tr/firefox-67.0b7.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "5324c7a9f1db368a4c944ae2d6fd2fac7b80d27638f7efb488f452f0c20746c264efbd4025eb959a0114b4f30bc02cf494d37ee9929aebfba29615a7ede2b9c7";
+ sha512 = "d89513130852096ec1bd685cf5072456035024e951dc9b6cace23ac8d9d51fba47465c3b76d96810bfbbb651188bc9a5ff082ec58771bacc6c9b1eb46d99ae37";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/uk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uk/firefox-67.0b7.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "53f99d76e1381450c07c699e4549f15e6eb92e5f83e4a3be883c72693082e3eeea9a93dec4b2daa5268b4551846664c242bc029183e6ab8c651886a8e487cbf0";
+ sha512 = "382b333159efaa048cfa73d7e11874a00e4f34c48ab38c4263f49184d00e3f35a71cc21d11cb09b0e68c04e714d086aad30b346d91955fcbaeaadd968c29fba6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/ur/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ur/firefox-67.0b7.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "50fd6cbd3a413f6bb3327a707ef59779eb0323bd28e0dfc842b30f9a42d78bc46be9807fc72e44ae8cfa1c9955efa4dd20be44fb3ea70189bff3e601a18c9a4a";
+ sha512 = "a620241d89b926eb1b42646a1d52e75f049191b711cca724ea1b6335ebf8c0773ffebe97cbc355396b21c16b7c322c8346029a64355ebdea2a5eef1e5329754c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/uz/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uz/firefox-67.0b7.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "a77f509def0075f3ebea49f6f5834d5336c5a6d37c5282190fc3db04e833221a9195e098f7003ba18a8dfb0c86575f3ad801b4db77c3d59cdaae04d6407076b7";
+ sha512 = "d392eb81144e93fa11b7c85c6defab5eaba7585a93f5fa475531d2be73a65c546f3f88b24cd3370bf301c4f780e60a53bf68bdd480fd4a6785e9c1583e71da47";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/vi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/vi/firefox-67.0b7.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "23e6dc916993b0925989d49b6fae3291002b4fe305d95c3984bad208ab6565ecbfe153b892855edc0b3189ff68e12597cf51e19d1b9b3473e1836ea6442f66c8";
+ sha512 = "7b4686deba1dd981e398f1bb6f192f828cb1cecccce6715c81cdbf5e89b4727cec214784a1920382e14c1091b20bff0919f74e1da8bfbb1a3568309801bf7a9a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/xh/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/xh/firefox-67.0b7.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "23d5b22f678dcc8f9157a66cb547d8593572e2e4a8df426fe2a411a4bdce72491a769e5a4fc1827c5e99b16103c7738eea221fc5a5d9e13b65e722056e3508b1";
+ sha512 = "63cc7b999aae85c46cc60b2cc0747a25e1d0663756938c329fc539a3e8ae04e43224051e066cd05bb38ba351f1ddf868d1651da94c0064d9715e5019b78496e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/zh-CN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-CN/firefox-67.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "3d1ba89ba92c09f9c29c9ecb946e36434236e84c42392534ae6f7aeb15fc267b7368f24598eaaedc8ee3a938c6071c89b73678fbc97e5983b625fbf69c8583e9";
+ sha512 = "1d902bbc7a703e7b541669c7f12427cbc74c01d784383409def1babd9907a93c53c32ee6c52d4c237b79bee69d005226580387a08e3ed51c1d685853637c34b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-x86_64/zh-TW/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-TW/firefox-67.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "dba6bc4173b00ed5c9cef6bc7881a4cbb64af32d21cf05099a2832a98479cdc08780389970ef94e003a2a895bece74a444f78dd1833429d349954099ed7b466c";
+ sha512 = "cf8133b5330c4badbdbca14681226a3298e4bf4844ca2be6208f4fd7d3d209f4215b4a3a1b599d59b449e3c76808d71eec1705bec47c964b219212d4032ba1ca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ach/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ach/firefox-67.0b7.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "edec732055469a0d9db953cd6a622e28129e6bc537a7c936b30c28816a7a79f6004faf4815bf5794f47ccac39d0c43d5c52d0d088cc8bf625eb57cb5df8e56e3";
+ sha512 = "c285920aa77f311451f3eb36991118072afd9d5fe863d88a49fecfb56549f1bada5ac364d457e7158a2c600b216cd5672775f87d85f3aaeb8fe648d19c8b7086";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/af/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/af/firefox-67.0b7.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "f7a6f355dad3bbc64fcfe9ded8d0e2f11bd8ecca9fefc40823bbbdf15fd28b63d3eb97597484c463e8704495286298536bf883aa07a0779bed704a544b899d2d";
+ sha512 = "335452fc21c6b25775b93ccdc1ada7ee9430ba9f4b6b8f6760a00477fc00a2bc1e68f318c0260cb3386dfb6ff5f1780293393f9f700f15b2013186d60735d789";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/an/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/an/firefox-67.0b7.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "f78556f850d9afc76418e78b684af8f1c85a9fb5c8636324c36f9859ceb9fe72cdec4fe652b326902ee3cdab54881859cdd7271906f085d687d56477f49359a1";
+ sha512 = "548e723fad381a772e48d8a60a2bbbf11fce50ca187fbf052d9fe153fe9c6c592769fdba4eb3c4b423ed9775497add0abc1ccf378e13ee4f069531fd0cc03e29";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ar/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ar/firefox-67.0b7.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "1d2ba213fb80aa3b9f2ee91f1744a5933b84d0b6803342e03d2c49dcb31be2694be27c13cf2a900f4297d62ad0b1cc44b43f72452d9cf79926db83baa7883d2b";
+ sha512 = "08834c2b950ec4fe06fe1fc3eb65e4701c01c08fdd91e59195053ae7638bf807a20346460ac9938590c5625e3e6845bab4205321e8d5e312fca69250eccf8303";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/as/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/as/firefox-67.0b7.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2d05c7a47944d7b9be1fda11d6f170a4990afe047f0f437632e86b7763fc376d4e624e21a0324c6ffb0c497ece24e00641eaf2de6956a2f22100c3f5d974a62a";
+ sha512 = "9573895c11a55f34ea6e43e0f072119873a28c85478b144ad4822ce6632b09d2290a87db67957b3c306668ffae0bf2c5703d4e3ecdaf1ae77170dc9e28ffb2e7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ast/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ast/firefox-67.0b7.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "c3d09ca3d4c7f40a0ac0560341f8063aa982b9d65d2eaf5b236b4bf7eecf716cc72a7887cb1e7b7bc504fedbbe37c4c8cb4d48d0beaeb3667d68554152fbaa40";
+ sha512 = "be780b51079ed16aa62b00e0d116d8507f4cb858a22a5fba1e95d5f38c087b56b66e37a3ae50f4e2b5e5db6a5162762dc6cae94e9c07d263e38c480fabab50dc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/az/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/az/firefox-67.0b7.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d7e6ca272bdae3d59cec97378564bc9d3c0bf9a19f3f2fbb17cd4af21bb2895da53fe884c715faa29b9e318391d571dc01303103e78037022500cde0e28ec990";
+ sha512 = "11c28539d558882835eae2c70e1dd72019eeea8892bc0062467e77b6a87208ad8d9ec3ce8b6e58037013f92e495db1bf611ab8e64ac69102c832952a021d018e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/be/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/be/firefox-67.0b7.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "021568f9f320840e1abdbcbac5b7dbcb96fdfaaec5e953209ad579ab6a974a796a7f7408505b0b273a0395c9ad8ef580a4535b44753c5b7cf3b7df6d7079f358";
+ sha512 = "2ba110389b2f416aad2d62e0b85ef2b99494be3add97908b8687243968cb44a6ac0057f0ffdb815ad7e93ea1d84e718163fb14839819efd9a4a38375595a9be1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/bg/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bg/firefox-67.0b7.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "827430e8e99d9235dc75a28e39cc6a02b04c1f7d69a5c6beec57060619aebe5bd1feebb52315fcf31be510bc7788c72d732ca7e77ddd7aa862335e2f5aa14e2e";
+ sha512 = "e5793f784fa49d07714f9984a884dcf9685431e37453525f67c0263d991edf380fcd96e956f9d715dc4d32c790b5996ff23d7e759ba5849b91777e20cfea97fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/bn-BD/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-BD/firefox-67.0b7.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "4dfc72172d4241fada52404097ca6c8418046ce3aa53bf56ac35dedffb2de14b45d8ca03d204c941074cd8c36ff035a11d5ce1afc8f63cddb0e0f24f9803485f";
+ sha512 = "80670cf579eaa7f7788a90ac4fea4e85a433324eb258d6d922a85585a9bf8fd8e3955343e4707a06e98f1c6ebf7881b0dabf4a9e4a3a8b503c2cb779d7a60c4b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/bn-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-IN/firefox-67.0b7.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "47c5e0da01eeed8ab2fd74900060420d25454db563bd7eb5a00e828f07dfec6f4d4bb8cd79d40b12497694dce051ca0e8dc3a034d4e2bc69f93e79dfc44ec891";
+ sha512 = "bfdcb672b4bae1bb140867e82f3ec1ee8a431d076d337ebd44ba17bf532506672ed6631ee54d80dbfa0b7814b77099fed2de345620a94e14d63e7c59578ee01e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/br/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/br/firefox-67.0b7.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "080ffc5207c0b1fb82cf02d1377b126953be6c3d9d9e406471c4e24db75e43f6e3baec8ce7173499638a5dcc297b90013c12bf310f7f33004983ef39275583be";
+ sha512 = "275b32a715d433027b9a7132624358e47d35ac7f81cb43aab21d646aa7938ca7ee26aa67839fecabb556badf5a8bdf6656ff3df5fe9311452b9aa37aee34f98f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/bs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bs/firefox-67.0b7.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "7d24e13a08a1973788c63561dae2e5646db110442dd8a39fdd3716c1d6701493503706b402792f909a8f454ff2ddcf289919afb922909889efc5704e08d10565";
+ sha512 = "2684ad81e644ff26985c938fe88433b70e5f007b0fb767e361070376ce10cd81d179c96c500209316e5cd5dc239fb68080fccef04988014ee79caf4d7c480197";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ca/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ca/firefox-67.0b7.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "d255300de33c115560a71d470c082383d2d2fba907a90d316000ee96ef00945822a868ddfb4504bd5501fb71c2d3da20625108232ba0c00149e84117d29ca34e";
+ sha512 = "6cee8b8cf26e38e785387200d84792a01081981b3c2934d2f9d06ef50b26967d0098e1429b1af7cd819618f5079af2a7533060a886be5ff10db0bb108fecc68e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/cak/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cak/firefox-67.0b7.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "05eb98b5cb0173aa0de1f0a683979ca6275b1bf905340bed1c3bb528269c5dc266d560c8ddcf53f96785d38c2ed54f872c81e5dfaa2831d844240feb7c8503a4";
+ sha512 = "a7f3963b020a074006fb6e367ad25b632899d14b915d35e64613a39fd0c185425063e92717bcbcd3138c05ff73e7734a84833c0065ad8655166a50aaee845946";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/cs/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cs/firefox-67.0b7.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "ee75a3e8c5a9d806cb63e554f9575e589b648f3d53634dc86a843a9deb94f45537c4ec24d032ab2bf26b28c395093bbd3b6b6d0793739df34c753d14019b285c";
+ sha512 = "7ecce91b3fd5986aa58b51e24c46d3c689050a41e95bab3136589b660db1ea4509c93cab7bcfaf13b93ff533ddbc584fcdfde60a0b8d4485b937cfab9e98e64c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/cy/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cy/firefox-67.0b7.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "d925d4806fcb022708949154d6ed39d095b0b8187bd17e3ad331f19fff5208432c1cf9a832c9e44ed05e7b76ce11cf4a56585bfe76bc76289a8318c3f622704e";
+ sha512 = "2f402c190177ed0aaf52923d003fe886403ed086d6ffcb0ccde9d0e9384168712da5aa7d7ddcd0730a0d6387a079c699226e039494667affb66d911882f20892";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/da/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/da/firefox-67.0b7.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "c0f5d65ca5f6d4598dd0cd216e5a8974d7759fd34b67d116fbaa9aa7489fa16867f7e1d0ec396640e0899212c8400d45f58961b2bdcca6fced91d27f69eebd0e";
+ sha512 = "7235f4293b950fa26aebf81726b00420db83e423a2d423569ed4d7754aee7fcbeae50b442ea831052220d9ed4c84d922b5a4658bb92a5bc6c27f57c4c0fecdb3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/de/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/de/firefox-67.0b7.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "0332b4828a391b2d0df5312582891aa01a0c8d2dd26dc17d05dd9f5e178fc481df2cad2a7705cc7ba54ba7c62c16c1c9d84b5e31f50e11e31e341419e040ce0f";
+ sha512 = "472bd0c3013a9e5b1ef96b30b1f5738a8c9bb63e76673bed6a45aa4c28dde3f1e5ed3cce16d18b47448c92f6129ebe22479480f24b9fa277f1b4ba1155ed11e5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/dsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/dsb/firefox-67.0b7.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "f4673ebe58a0f72dbc1ed995b3bbf198f53b446149e5a156ae420603b59bed18c2e201583ceef188d58ded2cfe06284209010a373656844dca5b2d43f2eec206";
+ sha512 = "b4c8001347555317bf5cbd89e29174700c025eb8f309a472126c572dd5b6c85384263264ed7a8ecda404faf632b9b2a3973a1b948f30c3e3b205bc42d6b17bcc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/el/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/el/firefox-67.0b7.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "0f9b5872236e25e0d50130d7f2d68a8494f5781b74710e989fc50f9c641befbbf44ba086530964395fe555a8e785d6480c51add5f6ee76cd61fe5b7b0cbcd6e6";
+ sha512 = "de37aa7776c31e28c670fae321d7bde7d4be5024bf5e5494688aae1aae909ffd034b46004b0d816988cfcf03ce9ffa326a503882eebc6ed05a67df0bb3d89d68";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/en-CA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-CA/firefox-67.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "87c5471f178c8b6a2a8495b68e85eba9b2071986256fdfa6a9bbb53452fe6abb7ff67fe69a2bee1fc7fc099bcbad20b5d8aef08c690e1cc833c1a7c14833d3c8";
+ sha512 = "95cbe469dbaa9627163fb989e6b366324a4005ddcddc5255735c95825c6cf116a6af12bbe4d44d1c6b55c824ae00e8b122020f261cd3f9e450cef25147b2bf15";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/en-GB/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-GB/firefox-67.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "d8e03f77489a56054d830327013f1d3e081d982977737e37425a77356ddca5413ff6b22cf1620caed7ff9a9959f881ca011d8cbab3e23963a6f6ab60439eae8a";
+ sha512 = "cbb468eb20d7bc4dfcfa229dc45e0fdbceed9d97830baa000642d7e740f1f28605de57112b54b75b1e08fcdb2a4e03cd7a7fcb3fbeaa4fae84ad57c1e564c506";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/en-US/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-US/firefox-67.0b7.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "43ee8c9cedd59c1d774d9ddd2ba5c4c0ec0cf70b9cb389791d729e31b49fe5f4fc42aa9685953f5a778b8a8a7ff8b6200fff24c452f7550fb33d311062d17dc1";
+ sha512 = "2ae29e73ab8f8dd068b5e09ed78b2473294f0791643adac77e1aa565149138b3e01b605f20f6b2e02a242d44e67bb5e036305631bcebdf2a15fbaf9931f011d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/en-ZA/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-ZA/firefox-67.0b7.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "038536b6a059833cf617b8faa3617ea7f6807d323e2384f677554d388584e6239dc52dd89b71140e578e327adf085d5a40774bb96cac49d4eb5c13551f98e667";
+ sha512 = "b91e664151d3b2cffba5cf23be229540a72e1499b1329818f416f9437a3141a98de20b5ce17b2ee2b8c7f540e589a4f1bd9a949f03bfcdd8a8c00fe92b0f6cf7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/eo/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eo/firefox-67.0b7.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "2d6c69e001455d4ec27629ed8e982465bc5dde5b063745eaac7c970cb5df7bcbd23d4b8178cecd4ef5080822902b2750b0fcfd6f4ef2cd787921f40193402869";
+ sha512 = "09eadcf32183d49b388d8c8aa1535349814ba42068f8325aa34351b6b4a51ec7e31d070ac836519e9d531bd29981913f5998cd83427b308b68f026cd27ba5fb3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/es-AR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-AR/firefox-67.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "d6d27a9ba475bdefbb617554f3bcff832c80edde7be8a10a7da97439fd57519fd75aa66b76fe82459a623daebbcc95a7ec70a311b79f439373817d7c2b905171";
+ sha512 = "792b7c4934e4e9cd0ebac9586919bd65a142230c0e88da7eb5e848c05b7a8e5d82a906815f448a4c618f0b068d3512c7170cf0e409cf0111b24a87eb1039dd47";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/es-CL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-CL/firefox-67.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "d696f2e5f6404fcd9a8cf10180580ad6be7d44a8214f2f8d58bbd3540125d6a02cb051e205afc7101bf670d5c6db623384053d897c976367b609f6f404eb453c";
+ sha512 = "7729ac7e668023838ebb5790e0fe482f20926308e7701c51d010bc0680605967e7918ff572fd50961d749522fc15d8b48524b6f3b532428f2ad1bb3c341e0369";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/es-ES/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-ES/firefox-67.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "5b737602c3c3849f2a6f207ff521bfd4cb109581ba3ef2ed9da9de68f0982ad2ed2fe9ddcffab74fc812b54c1793005e51130d7019399bb16e5189001b9de384";
+ sha512 = "14cc974cf9cb588d35c9a426b38d747cdef83334a0f46de482588263e0c4dae0179821dc6dbe938ccf5c17ff8d2952665522e77b9dc7ce5a8a65ff8c2d2b8f12";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/es-MX/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-MX/firefox-67.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "2acdeae665f77542e07d9e909e114abbed8b05fa1e77a94eab479053b0b5dfcd3db80d35d53cb4bba8587466a8da1deccea808b305223b870c919516c191f735";
+ sha512 = "0eda6a4240bf8645af0d1f7396155cdf13d73091c5599c76876ecbc45972c3cdc6685d694aba41d42a7f50d49fcf4910a382f1afd210e88bd8b1e219cdf954c6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/et/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/et/firefox-67.0b7.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "3bb8f23ec9d311d496af593bedf2fd00056cbc1500441f9a83332308b6175e0dbfcf35ecdd4d53e16127718c187ed8807fd5ac0bb7aef3027ed42e90c2f21a91";
+ sha512 = "6ef2f06a3549fb58bee6ac59f45b7758f40c3b76a16aebf2d2ad2bf602e4510883d0c28c941162e96d3694dff44628770f62682c5278bb09af30933442ac5baf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/eu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eu/firefox-67.0b7.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "94f1a14d78ee9b9acd6ef7366687e3430a5e5eacc0719b2ad87d7e55cb8335b72a1b89c7c6219566b5be1715affc127ea1aea61c7cf7099d1318b2c03cc195cb";
+ sha512 = "38b323bdb16931abc8ee01b1e3e19e893d2eb830f55775e52e22cf8975b44eb67420d4b703fdb24cd221728c728b6b8f55d6476c9fb4a22324b9acf422d03d23";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/fa/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fa/firefox-67.0b7.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "b3c29b7f445856246e70cf80b839d16b35263a3ceefe705cb3f44246c6e3a20b252759396c6130df80939506e9fbe19783bad168885b1e62a41d8b143ea59eff";
+ sha512 = "3211681e01a02745e800be7e7744b25c12c6c774efc2eb9e9167eb13e55a25512c6f8e9d5203967851310c38b9304d1c4556673ae305b782d274c2e8eec13d8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ff/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ff/firefox-67.0b7.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "da82ffa93eb910f6e22b86e8bd8e7258b9c458e36bfb092d8ca91d7ceb080ab863016e5951b7a73c8af986fabda11bd5e35393df3202c765c9cb6640ade7ec84";
+ sha512 = "17a867cf3d51f59b740991cc70d235a55dcdec256913a461055c82f461f629e51fde1ff8931f6315507a1ae4f9d7e632e69a06303e720bad0d6ff853ea45f1d7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/fi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fi/firefox-67.0b7.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "f00df21343824dda6f1f3ef207efcbdabce4a1eb400fb98858a23a3236a0cda11fb0e5a49d2b615726d200b488357686d8bc1807b1f4eaefe5fa7b9d0fe08284";
+ sha512 = "9cbd9620e6ebbed8e02d3acd35967b1f797ac8ae141de45d4be5bc21b166ce6803b4b667b05de789c23f8326c652b2b978b5681dc84af49798d319019dc9bcf9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/fr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fr/firefox-67.0b7.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "92090431ea5513582222d0f84e30c964f5291e177f52ec8285f5cbc117deca98b638f201441ba0195f94c5d6bb16d02ebd9200998457eaf1ddeaf83a54c70dd2";
+ sha512 = "e4cace463f0f87532274f1094c7e843eca07100541f300bdd092860dee986a87779e03bb960e4f6a06d652d93d0e667093c516614442277a9106a84cd8d9ca75";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/fy-NL/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fy-NL/firefox-67.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "699c9c2107c5c1442e635eabb8f18c36050954d03e7bcd1b46f3a38214fd970f370294630200f31de864aaa98345b6d81f863e5258ea9b4088cc253d0bf6e1e7";
+ sha512 = "1cacbe08d3a059ced3397110fff471b5879e3eab9d2391383063638d62792c76432ef58be2b2c7d4e23bb72fa145a175ff228314c768a1fd3bb41b72df990b66";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ga-IE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ga-IE/firefox-67.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "18899eabccaaa895cc84da3b179977f75653f1eb416a7add3a7b4d763498c3999c3ac8b477e4a4d28c806893a3a04037e3b9d43029b96e11f49a448982599a98";
+ sha512 = "c38de270ccf6b7ba5caf2ebb986c80a7d35996a3b7087816a2438e5dc8440819501eb08f9810c592c699b101693cea256c5265b37f51433558fade6030ecfc5a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/gd/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gd/firefox-67.0b7.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "ed26f0255fb387cb122b3b951f6c7b4d86fd1d770efaac5af1c0dea71ae2627138b9e0d690ddbb5bab6dd2ac1f34e60b73056a35cce8e895e06cd099d2e1e8df";
+ sha512 = "57573946f74bce289e14e7b07d4056e3fe2b631480a6fe25d8c844a7e8e39c5be4e065d21540fe53bb798cd35cbc26839cfb238ace6c312c6a1b46e477f6116b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/gl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gl/firefox-67.0b7.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "f814d398b77d90ec5ed3bdab7d056bbe6e6f45f0789d5f17cdaceecacd6027227d71427478c0f09b00fd6cb86adcbccbc20ed68ba2aa0bec9bdeb04db4e02338";
+ sha512 = "816c5bc6f70d211471d469c4c2e8492fbf314419a24be460ba9df68f1548f1051333864220d664214f830fb15bc9e19092de5e070c09dcb938674f93b7b05131";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/gn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gn/firefox-67.0b7.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "c16fe7ca563f9b22742e004b06c0e65c11db087c0f9ff745e1055a8a7e0418708f8aa958ffea9793a6b63c95154dd31c7620c34c038d095e35d35acbbc442555";
+ sha512 = "dc09910ccc01bbb19adb3d02ea593dc959912a704d43e23e734ffd9d7f9bd19338832786544dfecf2faede03a9560e10537073208c1c7f23e1078a876c6efa54";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/gu-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gu-IN/firefox-67.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "9c317777703eb82e7bb36bc4499288e6444961ee972370b33d059de609940dc6415c1cd0e4345c7aec7628d72e56c805df4d754e7896f86675d59400db8a467c";
+ sha512 = "e2160344d5b59640c454f1387106c775a4c7b230db11b08748a6b5f253af9aee6656cc579068693e37c9c690a5cf21cd999d805c335b83f1b66f5d762387f8fd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/he/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/he/firefox-67.0b7.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "ec308c970c79eefe955bc69f17003a330189244282d6c635c50db92667cc9bb2dc19be0dae84314fa93920e8fb99d05238e66d2c0a78ac0c5dc4527f690246f4";
+ sha512 = "0c2cdf90dcf41e0912eb13e11e0461d007dca9c78449bbbf674e672b47552f3210ffd14b80442781c5746a098098e31756828652cab0e347db020cc37c3f6f6a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/hi-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hi-IN/firefox-67.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "b985b06e99b57160f74a73bf1a860071add5df0908dcb9930c8ba41d1fc99754f8e09628436efbc3b6fa68638991458db27ae99b3470615a1166becc09a2edbd";
+ sha512 = "0adb98dd37ddbfba3bc08ce59dd9f401fb00c6c5deb550b1a92baf2f2e42e4ab6aecc0f9ba3d35c57cefa3326f112bff351f4ff9a258369889565e4277445475";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/hr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hr/firefox-67.0b7.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "2238427d7008991c47f949086cb02ed53f25ff9874e06b50e128be8b0852e9cdb229c666a68d4ea99e535411afceec9d44d0736ba10180af50276c661b0de77b";
+ sha512 = "86782b71427e4da1c30371e40a16d84b13b24e04358d812a41faa08fe7bf178241d44fa91922058554e959008e276d38dfd61f7389e0c9e44737979486f22718";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/hsb/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hsb/firefox-67.0b7.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "c7f8ba3a9e147b5cff4045ff2d8a2f98999a5ace4e7e38906cd399858f2ce71d293cb2ec1be05e07b6f9ca3d2db0653b65985d4ac90cd701150db32b5902f678";
+ sha512 = "9ba1fe0695fd467d48c1fbe78423f0b91c962524762f1807b5778a9f81c6ff623cc6d4eba618a228ec182414e6e6823447b3992dab43176655fe8f90fc865c79";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/hu/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hu/firefox-67.0b7.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "66b675adb57d1853efc58e220c9cea4785fca1ca9a1e136b37e50305847d03d787ade256a29a521092ba30c77a711c8051d09af661cc1fea70897a3814304fa4";
+ sha512 = "47d44fca671a44fe085bafc404992ca8c2b3fb2155c178c2cf38860e7105678077125487fcc459da3396157904fe6870e47bfbed09b4eaaddbb404715e2d098b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/hy-AM/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hy-AM/firefox-67.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "b3f8a3f960bff7c2f3f81b819a97a7da7cb33352126ccb5c02c2825aa4a2ab8cf0ec71c4f9231f16634eda68e02be8c9aa5f9e1201c4d62ebf34fb03dd1f3a21";
+ sha512 = "72fab75e3cb0df96c2aa101475f1e66e5ad36473b400d4ea3efb1e14b22028a67303228b04fcf39221995ee3b18302d9d447b315c48401b8acd566d815bae60d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ia/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ia/firefox-67.0b7.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "22e183915ed085a99258869f46444804d8dcbfb4ab6f200b7894455dbe4744df82c04fc15b603dbaac0d267995e487d0615e2844249abd849565d2ee59da5904";
+ sha512 = "a057c3b8bf87fbda631206a6c2ba1398c18641b92093478f472e818f81dece057234c221322497eee68d33838f5dc99a6cadc92f157aa464802e92f08f7a5f20";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/id/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/id/firefox-67.0b7.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "61b353d4614b4ecae841270149fecac33ed5461ca50a9e005b58a852e0bc0927b849d49962e3650db8c7df8ef7dda6b0d7d5593a9b275930f04d1d5f95fbdb7e";
+ sha512 = "c9165eef8d41c5e72956beccac415fd4695178c465ecd81abe82fbc372826d8823056a1484e01442f883022182818e7c5154441c113519b2a918e1233346001c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/is/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/is/firefox-67.0b7.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "875fa8b0aa77724a91fefb614a022190f3f62ae87514eee765c3e6df52bc5ecf7b0f50bde11cd06c2eb424db1283347688963a151f3b391f1f1dbb4d9ea56b34";
+ sha512 = "b41810b6e4b5f28efe83aee464f5edee0784f24982198fc0b3e333b7a16d816504e8ad558e6298517695f06c3c7f87d7b98ad80e0baa6b10d748c57ec3fa8e5e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/it/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/it/firefox-67.0b7.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "52090824d82a32a9be79306e4a5f4ea0d212b1a23c85af46e4e5e251eb273db6a10455867340efa541fdc0185039b8dbd1f1ee8cbd291284dbee957cadc0a0b0";
+ sha512 = "a20c21d5249fdcd0e7c2bb62177046ac26fc6b0b87f53ed56511f44798fe6a99737851045de3dcd2f42db689b32853848d25df8cf2a8cf731853fdc23a191a7a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ja/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ja/firefox-67.0b7.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c5f2280482c62a3fef44584e77f7d5f2b7e84868afe826070f7f28c17a1c3fb360c941641bbb8c5849e3380c64807db3c15dc89399b4bd8dea271e8b2c3c5ebf";
+ sha512 = "233574779b07c9173b160760dd1b229305b225e9b9580a680baa31a0f5b6b2133fe3013dd2f4cdabec3a1c930aa1def9f3ae687c4043cc9a4edb83ede83a353c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ka/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ka/firefox-67.0b7.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "d738c1d9cf5f453e5753f8948cf342bd12b138bad7f50daea3214762a18002da48a732752cb5df85bc360c58b56f5436a932e767c00091419a03dc6b65067411";
+ sha512 = "b1e3b26e05c527111888b5d683e040873c3dd324bf3d3c143e22abf1e55bfc4b43ccea09fdf05a58dd28710d5624b01529c1e341b963c13895caf2931c7048e4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/kab/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kab/firefox-67.0b7.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "560974dc8f0ec5f21d6ae472e82bf4b8d1898d015da6a175a22d97b21cac589a0813c2089219b902161760ff9c44dfef06dfb9efaeaa7164cfa0099dad121cd4";
+ sha512 = "3f0a5dfe8701ac74fafd654607d40b3a258586bb7791823be84db682a84339ec1f0305212de9efc2754ec90ae7584a05c58c26d370090871af38e5ef8bbb95a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/kk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kk/firefox-67.0b7.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "e29016346a9a2d31ebab3a20c4a38f1562a9b1520db29d84d611b3ee1bbcea78ddf834cc190fae56ada11df9e89ca3095a03c76c791ce7023a64971d74ba94f9";
+ sha512 = "55a39f67b34b21d3fb31b4dfbbde75af058ba32b1e5f666847d2d053743ae51cf0787a09959fdb8fd27df6daf38f801f7aa2c0c6ac4f64d8ecaac3d893242e5d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/km/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/km/firefox-67.0b7.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "56f911d18bd5b25d52ea5699ac9091ac48561115b9a4ea52e2b0c3264ba5cf760992b703657d700d00d0d3803328789371980d2bf7af602860a06fb028aed029";
+ sha512 = "e4fbc74ef0df4989b5776d3a5c526f323d2472f5a2460b539c120c54e3c3fb3cb8397e71126fef3cccbbe9326d2346195f08f415c49938dd65f63807894f67b1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/kn/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kn/firefox-67.0b7.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "74b7298667567d260f49425112774c7d0648dbd50c05552d81a0a0fb17a9213b87e2858c1af09178b641fb9e83fa85e3066d9aa6c4ce47f37e255f1a45aa95ad";
+ sha512 = "5834427a79672c0e7538825e52eff561a7f018e763eab8755e295396f64315de968360ba4a8a039215dc80444d8e465a1d5ba7c11a60694b4ea16e7f0f340a77";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ko/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ko/firefox-67.0b7.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "0ae3c684c3307b68d493a98505b8f1b953bf09a3ecf72bb6fa975c3ecd0e18f15503ed870cfec490fa32b203655fd28eb15d2c1c3d1a0aadef4bf40e252b8e52";
+ sha512 = "9761f01f078d2cec24ac785c68c95588de533be04b4ab37184b01c677c98ffd70dbbc1d1550338253dc38edc884d51d134496cef70a05435a838edc0b5068990";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/lij/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lij/firefox-67.0b7.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "d5c7bd4e302f4e2dd3a9140527aad89e3dfde8043d0b42cea1d7aaa084f9d2aef70c70d74de0c86658172bd005f8cd0c1e46a17322067a7f2813388e2897a868";
+ sha512 = "4b3bc0acb18d2a2f80a4a469882df2b72594357ef201f337996bbb3315c260ee503030620e9e42a823ebd8cdca531f63e9a94b9f52bfafb83a7cde1e520d0e3e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/lt/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lt/firefox-67.0b7.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "1eccb336c06a6e0a2e45258331d9a1fc8a08da3b6a813f9b0c0e619c98eced2ec74d332035bd5bc836a87c338cc257dcf39cf43322024fd13b285bf489eec6e0";
+ sha512 = "5e9b8361dadc8df55055dbd15f4b2245cdb9acd7ddd7853417451246e59fd4b30b570c30acb2ed078cad3fc239f15218045ec99eb006c8702677ad289e73271e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/lv/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lv/firefox-67.0b7.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "bbc4eec6b0a775a036c13f99da28d9f84c6b275c90ff9604df1477833720af10f224f44d753b70988237b13f8b8f30a0460080ae5c186c000d04e79abb871edd";
+ sha512 = "757428fc0c04f757c424da039bef8d7f4653bae24b1532c1bff55305a1f7be8063e9e4a01ea5034f7f2badbb5202bfcb82954cb39438c714dd97ed0b6af07f04";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/mai/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mai/firefox-67.0b7.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "5aecfeb26c218ee28683c41ead672d83420a29fd8833dfac1758dffa302128818d62be30e1995598c06945baae83a534c26ac3265fca9380d0dc69248e5977de";
+ sha512 = "451cb28d1aa9d8898827be4645eb32f49cdea09b493802c78c9b4316b22fef7cd99a46c1c07e2f06e7dec2415abb6bd3cc7b4075e54805a843aee852aeeb19ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/mk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mk/firefox-67.0b7.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "3d544a8a671b884b6e32d75460d37b6eb1fb32d8c178f3c1ff7bcbbaf52a00934095f2e7cc757c43e85392ff41b9173bbfec049ff11deabcb3af8288f5ca68c5";
+ sha512 = "6ce5dc05deb1f2761a8a1d4703522b4b90fa6ceb1d7189818f0b22340d956664af1ec3b92c965bbc46889835e4403e1ba189b3c0bdea92e36a8aaf3061a3625b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ml/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ml/firefox-67.0b7.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "a60bcbd2e07aa6b26e6c88c8c8cd73609ed0997499e34a4e832210345ab8e54ca087b0d25a2691df4c5e81994fb55f47d00f4fcf31f187766c165cecb88fbd24";
+ sha512 = "fc9a68806276cbc7e9b3b528d6b93075429aa8759722bac01575680e6f7e94914f51e44ba0968aa841631aa876bcf716a0f9c1cbafdea31adfc0dddf758a80c7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/mr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mr/firefox-67.0b7.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "d7146a0759b4b9f4a86b05d46d97cb9fb4c3902654ef9a72b2e2894e09725c9fec06988af24f4cacfffad208f8dd8b3d81661cf3b56f192c7c0d421b06d0f3fc";
+ sha512 = "0ecf5e23e5c2bcc32946e3e4672557224e0af6081f8280a9c1f49927bd9dec9b3ce4b445c800a8ae48e75a514e24beb2bc0e760f859bf1f5a6c0cf02c594a6c1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ms/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ms/firefox-67.0b7.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "dffb810f78f9543a4adb004cb0978c16fe26ab0130b0bd96f421023573c752563ccb7f0fad592f35212fbf289a1a11f767830a73c6530ca3cd0409a2f9bb185b";
+ sha512 = "1adbb3d092dd0909f5ddaac58240dc587dc819fe8a64e5e5bd3a81ba2d7effb516ade1a37bf437c42803ebb9860b322917ee347b62d4ff1cee503f3432988923";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/my/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/my/firefox-67.0b7.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "1764a68ec37a63341fefa497f3143a00ef805659f1587b9afc71864b4dd59ecc99b24fe5479dcb41104dc4c63cd0ccd4dad64af9079deec7dff031c6391f48af";
+ sha512 = "c7f9549a94b511231bd0cd22e7705cec80548a52eaf8f4af5fc975d18e0ee504a2e7be5b4b06504d66cceab993dff4ecc37e014ddcd051ccd545ef19cffcec5e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/nb-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nb-NO/firefox-67.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "eb66af2f40d9764727a08786fe5518375e7540ad96d27cb94f272921846754e8e0652a8d251cc044b0e61361bb0b90f81cf262fef5917f7cc0243fa08b9d67e0";
+ sha512 = "a6129f1dd66cde5a9166ae180ca24d533f7b2ac463eff50276354f0db7eacf28f64d5df587e833342c1968fd3c4a1f9f91861907767e5ed0ff543c37da6925bb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ne-NP/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ne-NP/firefox-67.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "1744bd86601013541a0edfdd04d4b3cb31ede3f9c509b527943324eaee49b4b1e41e3583a889161c7c39de4827a5ed57a50c5c34ab781616eee5b27a5b9dec65";
+ sha512 = "3281cac33c6dd97b497d2a10e4d4c9c60efd6d138ec9944d0d0e836629c036c7fb0c00cf84e27bd9bb7e443ddb6a69df4485a014930e2ba0a4ad8a224644a9c8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/nl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nl/firefox-67.0b7.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "e41f60c1611191b74b1e4adc9c34993dcbe000643b7da3933715be53d3c5ecee88d4f88b3759db0f4c5fa328402b354c2d8bc2bac4029404cba3f0bd2eb4624b";
+ sha512 = "b54914b0b065514a0af1f469fd601b76bc8c30087d7a23d5466ab5c8a71e5ec31ff5293ec2b1a621d6c4ad64158144d0f0691682cf974b97cde011701a8a9fa8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/nn-NO/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nn-NO/firefox-67.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "9e78f2abfe4acf9174847efb4884b0e353ab515ef25fbd33c7c31c52f95aeb7c20e89189a5523a17066d51b7ad66e082adcadfe4dec559cf278618487c9fe985";
+ sha512 = "6790ce0522f6595447a9f3b7419255cab8f4635807f8e67d83095d37c89aeb4eef657aa8c1b9a3aaa436b06484872933e5b0a8a115e43f7fcf17381726653c2e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/oc/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/oc/firefox-67.0b7.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "34f41164ab80783d9d8bea8bf0869ca6d5cfebab75543a707be692206501b27bcb9715010e0111d1545c360b8a76d5101775cfc49f5a1d0c6c0041cb2f427d57";
+ sha512 = "418bef24367b311cd26d05e736b73127538297b5c2a672b9e3e4c2b1f81b92e04564f3722a41fb2fd05d712f7c848248d020a2040843e797f7ec7747fe274b53";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/or/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/or/firefox-67.0b7.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "c6b1f25b00589072cb0429697d9ef1afa3250521795b34f1a65e8ebd7490db238bdf954783cd30db2fd0010da61341514ef277063d1315ef38432b91432d3400";
+ sha512 = "50972ebf6d86827604b066ad175a6a16250225083ae7b66a27690d8c052da84899a382fe80ea7f329b0d79b826375e9a356f5660f0f19b106f9539ca4375d023";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/pa-IN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pa-IN/firefox-67.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "8fb50efd68bd39c90e58783db2c70bf72de8cbeba3075501b3a68e3512e59d2135009981a8d97aad4de5567b6d0afaec682c5ecc7de4034d9061ca920d1e9f3f";
+ sha512 = "96a3cf9c11b1d1c77e3d51576229d046072fa44ca035bfae726e1dfcda696b0f78e5ee34a0d8372fc641245f41e685ce716be6a19bdeeafb0dd74a3aca5e089a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/pl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pl/firefox-67.0b7.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "008aaca90764895b7bc3bc5ab7fedd7560805858711b68242ee453b452fe36ff92c3a8fb6b95af20f275e18c4802341da43a5c3a253d082f35a60aac16fbafa2";
+ sha512 = "5edef293b1d8140240d7621503032d6b28ab6ac6c481ee82c0252e7dfa8a24633e00401ad790a80165f8074a289a58125afa29d1133331aa38c6e6a1740b1261";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/pt-BR/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-BR/firefox-67.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "8e2af026781619e6a161439b7830f69b20e54656b98b7479de4d780304547426760eb0535f99f8254318f3092ede2337aa3f15ada85d023cb4073f560499fc28";
+ sha512 = "f294b7fb5e2f2277ea5985e7441e9515a434ae45ec45b40e590e469720cedece0b5475e7f5249b8dd4aaf1d1dbf76a2150aa9a5bf53dc1e81042b9ebbd1956b9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/pt-PT/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-PT/firefox-67.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "566f931ef9d580ea448df801888fa9022a4790c78bd08cbac4a62eaf506ef9791ed11c2335b80494fa7b9d705eee9a3bfcdb17ef0f1397846273d8d52c9f44ed";
+ sha512 = "76e69887b1f6aad40164db1c7129ec0b80052dcb039a3e70ce7b5829d1f01e4a4006c028474cf101e59af61c0889f54f00351bdf94aed5d7929ffaa26625239f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/rm/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/rm/firefox-67.0b7.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "5513a55aafd4d18c513195e6d42cc108b1ac8a4eedfeb229617692d7444cbdb7ee2ae3dbaecb5e7133c97142de8223ad6a44eac86c06f26a77c0c0e0eb76977c";
+ sha512 = "07a18b9c089cbd64eb4baca99a76cfe2358e2bc5b3e8e63e7ebff64c801218774fe6c50cdfad0d5317963db74d79fc7d65000ee68b87f31700ab54249e73c39c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ro/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ro/firefox-67.0b7.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "3f75b24431eaeb4bd42aee093dea0acbba89e07d835beda38a99ea1af3023991d80d0502d7b0c8860393a6d7c19d7a768be2e8a6820b26b24f592b8bea5a7130";
+ sha512 = "f9412dc6fe36f9c36d36c1ec3f9ea757a9401d0f111c2b95332c0c2fc64308969764d06df39c57ae457b924214c841843b9d64d42020920d83fffcfe2cb18834";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ru/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ru/firefox-67.0b7.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "aaf03f30b5369a668f09fb5b0f7d98804bb8158ae92abfe4d6f878b63c8996d3017fac5619eda34cf09a47f8b82ca8d1bd558d2ca2d22977db62207d01198f3c";
+ sha512 = "da5cc7a67b119d1b454ab5a6597bf697ec95411f32680971ad9ca0882d74b8008ca84d72878271379a7404ccba4f04b00f9d606ac157323d6cd33646bacea313";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/si/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/si/firefox-67.0b7.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "c1575904c1ecf14e6ab3c7602f24c338a0cbceecf826e361f667f75ba1eb4878932f08973ac0591067f5ea91439f698f95c76b690e6911b9d09e9ddbe74dc227";
+ sha512 = "31713c81b82debe496f6b94799f81f68390b5c8fef96024a5baa8e54ffc39d39fcd820683873abf3b6456b5e789e2b882a6f0dba9a64e145a79782013fef74b5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/sk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sk/firefox-67.0b7.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "2e2d1859f261fe8a7bbb47c77ec6ec8e9fdfbdede203b3f37ee7b7cd638208398ef96207b6d592d96d1e7a2b36fd88abea957f447e31ab42232ea17da56d9753";
+ sha512 = "0475c5ddde2f150fe2c2a62d6d62db80084f7bf37ec191e2b976d6fd5a0a0169d7c557cd1cf9ab56b0f666b84bea8a6d51510320e8aa75096b654b6b335be26a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/sl/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sl/firefox-67.0b7.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "098676a8eab68cb3217238007a520ea7bbd8a352202f29cd8e5af89a9c927edf5f7300574bee6960a39494171cd33088c732b9d1061cb6da13c0d700518d1745";
+ sha512 = "771f9c7a404a2a2cbcc754fbd26ed5a47d093da522c8270526f1ba31b0535a669beb7325d81b38f6667b8cf982c95cb5a8528bb80fe32b8e2770d45b1b3d2311";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/son/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/son/firefox-67.0b7.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "31b4d4aa2cf5a4e6d3699c78ae885f900aafa92d63e99dff5ea945e07ec413b3ac47437791e077dba7fc318312298fccabb2ff607094247cf50a2b467cb3dd1d";
+ sha512 = "b283f759743e0298bc9c0dbc82c524a6e997754cdf9aa57792ada118631635bd673559275e9e6cd270e49ecae57587082290d66f023f9dcbe1fe0ec5d2649644";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/sq/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sq/firefox-67.0b7.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "fb228ff2c47673cb0bdfd6456178c40f2fdda05a201180c56f8f55ef9b619568ecef2a4d9a58710d8223e278fbcd3c525c8623e4018787990b4e8c23a117932e";
+ sha512 = "698a5dfe611fb2956d319b81b09886ebe511ad2f1e99bd6970de31498ed8f016edc3d136a9c3aeae42367cef09639b5ae9a22539560fc394bf93bc83d1344e3b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/sr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sr/firefox-67.0b7.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "ec229dd8da411e27d2110c4adc22eb2a1e6f324b4cb41fd3e015b5d7c076d2d15e5c7b1119900267667381e68433a0da399e3016a9c50205cb6257edac53efcc";
+ sha512 = "a9c3b24129df77638866d9cd72afa5f72dd6181355174e40e0cf8ac2c1a1da87c9a60565e6d97863e50e14a76ccfe0110194ce2547f8297bcd89bf8cade4f24e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/sv-SE/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sv-SE/firefox-67.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "435955b0eafc6530ec62324259d9f1d938ba50c408f7be385a43bf9a65dc2034259484b15d2753fb71fd037f5d1b374ba69011212d3886d31df41e31075ada70";
+ sha512 = "e71cc0f01b4a9e279810523dcf98b43a9ef82a64769ee7cfde94896d0caed75a0bfda07cad1f0120d44b738f48a0998d090deb49a7e9395cfd0150e18d292c2c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ta/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ta/firefox-67.0b7.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "004d2314b24427d3d1c9ecbe8431af17e52cf28154533c957399cf98ab2330cb264044af20aaa82c96000d02d70b36d7416d440135d3b06c9710c7b28fe761f1";
+ sha512 = "5c7948e1db8a8523591cfa598cf2b1971f01d7b8a79baeb932aee2aaa8ba8230aecf783bf7be8b27312599b8a59abceedd07cfa5e140e9107289e717efd77894";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/te/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/te/firefox-67.0b7.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "2a64f3e63de53b86ae35247424eb81f0997b61f4d2b4ace2e7e5748bd9897a3f0e692e407958d5b9037f6d77d40214114c84e2602cc23860f046f48b4194b503";
+ sha512 = "01c2e2103faa9b2bd22c6b3a9604433350095a8bcee430007114c440b765f091dd3adc28119c24c9024d70fdff1256220305ac8b4f66182e6fa9e5dd35c7c20d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/th/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/th/firefox-67.0b7.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "afb72ed47b6c0b7b8ac34c30ae33cdd840fcab50382d3123407709d5a0e1e0ee91e3b58aa2028d9e35d43a5dc7cbda1a6e1bde705706d6e0aa3bd57161a5b940";
+ sha512 = "9782614b88612fb1bc669dc26a61d266fbf1a8613e3ad3cd1193482985c05f182343589589c24ff016ce4dd1c63c755348dbdb6a699cb2f093ea00f7a629e573";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/tr/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/tr/firefox-67.0b7.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "1359ebd9c24daa248194383090c36ff9f1f0d30eda8f228c9fb7bc3ec28db353292d70f0ca0e41aaf98f1cf1483527939bcd6ede3cc4e9dab881efe142a63d65";
+ sha512 = "4dacea29f57f6acedf30231d08d86d53afb88b055195a0c11a9f4e2598460900b3b20be4aa22a8fd5794de3f636a575a0e55815621dbeac4a2f7854399915767";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/uk/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uk/firefox-67.0b7.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "5323a344773973ce752f259e9198f0f12582219e91d790831248adf3a9dda20d1efdb5fd016cddbcce9b71a80750a916360c28bde19f92f5804fd720f61ca98c";
+ sha512 = "3b92fc3c99366d332261c8cfe57a04fcbf285b5d5976e60da29a0844a30e9e15b1441cebfb8bda6dfc048f95ec233ee099042285effccd2d9fa10dc572b03e2b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/ur/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ur/firefox-67.0b7.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "1d1ccc64f63f1e5c5abafe252aeb04aa5b57e5103e55d2771c689aca5fa2933ad6ee0e0c099216eeee8bcbdded209c753eb1b80e49a9bcaaae158b7345dec559";
+ sha512 = "0194916cd60f933c5a8ac7738487b90584e2881cd45f51aa1fa81ccd410b0596623bdb880226247a943910add37342e54cccc9bd250e2091cadf871f26931ea4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/uz/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uz/firefox-67.0b7.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "fd603350c2072f1bc6648ae06a6838995e3ceb1d0c01604ea14ce97177a171853800ef38c4d53581a46602d95d5112bf5e34008cb0cd3726379e6f911621d424";
+ sha512 = "579779fe27dd2d30a5fe2498eba0e9227f0322f3533837dee60240cbfe98b68ba2b696984a110dd42f4a5b3c12110f61e33c38f7f489fa69a5c1c38280932466";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/vi/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/vi/firefox-67.0b7.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "27c88553d4a5b523afbf35e5d2da2b33591513e61ef4d2de2031e50f503e082dd24721e6b3553025d50a9f8a4ce4c7c6083afceb21ea01979bf79296c2265856";
+ sha512 = "d7f8699f2f172725095bacb2a7a9dda73d131933d308420a938b49a7cbdc0cb56e957573f9f8c46a909cc07184f848e98713390b1eea816e97cb6f4007179902";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/xh/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/xh/firefox-67.0b7.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "0716d2a37769de4703754f343d0be22f2d9c13415102ce2713ea210748be0969d740780852f1ce3078efeb496fe0fcf67e7bdd49896015a2bc1f5be466a91cb3";
+ sha512 = "4201fd07a57086607501c193ccab243a6a6e1758d349895ed1fcd3ef1142b450da16285881b9319bb63afe7f622e5cb7dbf68db27d17c6f21ab94920d5c8a305";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/zh-CN/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-CN/firefox-67.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "a7054b5a8e3059d801087e655faaaa03aa44d4a95db8d742f25cb6205020378635cd8caffe8e0930dc36456a67192aa5a926c3d9fed79d33c2bbdc9e765769a3";
+ sha512 = "d0a35927d7fd6b6f72b21ad6c15533af13a478d8465f1eb39ef9ddf1dfeaf5653d097e59de410f97453f9b545b97b9b82f22973366efc3b03aff7603594f7edf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b3/linux-i686/zh-TW/firefox-67.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-TW/firefox-67.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "3c59974d146c83594c4a553a5b0c60df95437bcf6120960125f92345c4918b7a3c51166711af495486ccd709391dfbc647b4f5461171a4cd6a468f2bcd7b439a";
+ sha512 = "f01bccf18cec3f201a9a69e167543de472d7dde86304539d6c17f093468d5197b0230ef4280a0b7af8d5a264485a69667fd81b458d85ab0bc7175aa80667d419";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 3ce04e185051..d60cb4203501 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 = "66.0.1";
+ version = "66.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ach/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ach/firefox-66.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "71dae8969de79a910a0a058e0a3b98ae7c4dbb96f11ff503b7818c0746ededf51eaeee5cf28178bae09a969aa2ce62e2cb65415b59b97bb828a26411a1dce26d";
+ sha512 = "65f92c4efa17af90eee9c44add39c3b3cc0749a334043fbc56d24966979631248de2bc2f9f7978e97482a363528412bf38780d84955d8cd0edc05898dadc30dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/af/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/af/firefox-66.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "03009e8f5edfa4c67390dd0091eeade5bea5a59e358d67f31bd73c80a1d439b73d2dd02930cd53d89b893e271a6d2ac71e9a9b96ec4c239a4233e947b9b25ad3";
+ sha512 = "06f8e60fda4ce450ffbdaf12dc95cbf3dd8ec7cc6b9bbc8ea76c144e800a17b96fbdbeb31c6f118a50b14ea7f55b5ff125380ce86b4ab2d2bdd05d5ec4e33881";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/an/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/an/firefox-66.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "8831213e8d1ef30e12905d99161bc6e24816bcbfe41b19d9dbd192ef777425abc383e4726e7744f961f701ca7b9ed708b45c7707799586635bd01e789c7c60c0";
+ sha512 = "9f3a0c73bcca0445ea9002e46c4d42d8ad2cc06419f663270cfcd4c6a57e1937530e6a1b0302648fcc7a64e5e3b7fe41424e56ba9c81a6726b556630f81165ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ar/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ar/firefox-66.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "cfb77c98cc68de702dec4f3a3f87a15eef642b7c793c1d16be37105282c693a4f610299720e79dd1c77b32832463c319195ec7d4179b907c081f4e9ff2e78b3e";
+ sha512 = "f9db879e2aedbc09f58a004a6b7e4836da8c0715367335028176c7051b831e5f88c9d7cacea91bcd3ecfe4f0c041f9f8d16c1a27ccffa9a89ed41b7dd3b4c472";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/as/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/as/firefox-66.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "da99215fdb304c3df816d35d8e14106d71d777c292604961ca234028603da4cfdd3650306125b5a9ef6cd799b3b939cadbb410efb0bd78d344e48efc76d31512";
+ sha512 = "3be820595d129db7cbe07d6500c9d9128a55adacf6f1d3d53fdec8d705453d9f94c53ff489de74805237024cd668f2c9568bc67fa2df686c3a4e7544a252b694";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ast/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ast/firefox-66.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "6b5635ca0142d20411c8285adfef867204b948280cd1195b5ef8e0c5a0bd81633fbdcf8f3a28bf6df73267ea4f7f861d6cad6b52178261950dac6bbb4a596a1c";
+ sha512 = "c04842ed940c442549504cb8b26610c00508fa1d7155cd690d43227b343816d8c780282d330ecfc2ce951a486f022adbe18ffa8008aa3a43c89b079af968b466";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/az/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/az/firefox-66.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "f91c6e4ed17028768acd4c5fe7b25b09b7547564ae98365c5b43610d02810417868088abf774e21d5d0195fa11dd6ac9a9a5e9837eb253dda95678dc469dc331";
+ sha512 = "2deb0ebfa3e2bb74c3c7f80c08b0323d81b38f9399037a3955fbb53e219850a8899ed19aff5b81188c3c8e4bbecb411ad046e0fbb5fe5834d5023935e1e10968";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/be/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/be/firefox-66.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "17a40ea56fedf1ffa6e5d99543d47512b52d810593cbc05b16b8a5a310f55a680086bc309afd34e8068dac15d1c5bb47d52611b18a0e679e3e0a3a6fe7d0e147";
+ sha512 = "c7012a19e0283cf0b7c45153f078eb9170447c95c62141bb1ea54516e363b11b306e1d7d89f673387ccac727b36caf51ead6dcbae3d290923eb05bc792c06187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bg/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bg/firefox-66.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "7a063f35275c5011dc6f14cfdac043f33218f2bec68282db38020610cb79c1cc5cd3e3dd34becaf4e56c84ad457d71b9eb0e60374836ad7c62346c94f06c9b03";
+ sha512 = "b9e54ea4d35e4f2d53c8e87e86f1b4d245ca677279ad16ff4d10abb252801245c80666d977993739f14ecc6ee5d80e07abfdd0ebb096c71a65eec4fa7df3bbbc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bn-BD/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-BD/firefox-66.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "c2676a7034704eb6ff7df573681c1881781825dcd0e2a19ff69cc2228719689c48ae06d5edc2a985bd217bae3cd7da519cf2e6305a60717037f66c7050cfe157";
+ sha512 = "bf75162072dfafaebc0c02339d5e2697ebf27615cc7d902c0d2504e986592764293272573d23f5faee12dc253b8ec29fa994106fac21a8fe9f11cacff2b28fc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bn-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-IN/firefox-66.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "d89ab4a8070800d18e21be019937fef040345858058af71a33b240a62117e5968328d8ceefa7145664d5cae02e17b0ad6b1d0bd2f123559bd7a4e54c25d8fe18";
+ sha512 = "c7bc4d575ab66066c88a5cdfc65cdb958479973ba44a909609aaf71022a427b982918177c2ee80ce692030702191d02408d775d262882809583e2e057a7e7fb4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/br/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/br/firefox-66.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "13cc045c7bea3aa9efacef755a69272dde64e6724ce40b1d3fbfb1844a1dc5f3f2af8deb24d1547fcdbc1ef15b6264303a1b6ced13857a9573d268b64b2b5b8c";
+ sha512 = "3e929becf7b4ed961c5aef6627e6537b2f9ac71804e206a0a29d7b538dc53a09c7c8b018655846ee16caaa8d704082a5ae25d6b74ab2cf859d78ce58e8ee9617";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/bs/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bs/firefox-66.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "68b06e9fc95a29e1b9ca576bef036e9965c7892dfd68bef6e8df3aea0df9879d246d4a00e720ebd9255553daa7c9fb43fe7a1f8f6b7521a54b84e22be2a343b4";
+ sha512 = "13f7240e1c27a7223e37b1fea9885f75969857857e880cb960059039e39fdd5d22100fd693a213cd5e471aa112ae05a9eef3a5a26d277e2b83286769d1333920";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ca/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ca/firefox-66.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "56766f1b05a5755a90cece9924f53429a99adc44c37b616511cf0bb8103478872ea72fdab3757c430cf4ee4f4f23498b9d8ccc9fba6d67e532d9ea08edba5675";
+ sha512 = "c9ca70971a8ce500c12fabcb4b13f6ee92d3ea55c7db4936fd5be238217af7541b7d87b6d61355d91ef44a0aa98f584d76e99b80fa42eb43da6da12548170942";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cak/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cak/firefox-66.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "6066a3a3c12403ff0d88bfbab1bc28a29037b3843c8d78596ff0749a559494393c28d2961180d321c2579f545fa80c37d2243f66d63537d2aa4f7ebd08a99fbb";
+ sha512 = "3496530d20164aaa8af56e72b294d9e68139bf3c8140a7d94647d0deb802f4dea7801643ea08dda69546e8bacecd29ab1bbee7854eddd3c4dd8d931d902f865c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cs/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cs/firefox-66.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "43a9df354525c665eec2976ed4269e195daaabaf44e2e84f28a43fe0f4fabb6f934d90f797b2746049a1a6fa275a251896f40cf9cb0db9e77c9082b116924c0b";
+ sha512 = "065e44c11789e2c12bb1a1ae4aa67d986c8e718ee964108d8bb9697050c534ce01ef0d1c9b00eb03b28a55a31ed7ba7741fc7fb692a09c1b8512f4f4f2d77d7e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/cy/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cy/firefox-66.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "c839c90bef23661f5cc08b1c7aeda9a24c8e5d99117aabe56492d5bb536ddeac92deae2fa7671a2b92d8925bbfb44d89eecd78c9553dff8b2396010f9162dc9e";
+ sha512 = "824263895aaf97000efe2bd59345ddfb4e3f056fb15f93c7c211f001c3921c83d736b8c03c68fcf7b2a35560b12f6581b0df30e9382ccd3d725839d9385b0f8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/da/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/da/firefox-66.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "605d674016fdd0724a1305ac1bab2d8070beaf51cffb09c06fd26d464e36fc4a97206746a835bd55d4f80c8f5c8c1f271343598000e77c6036105db65ba064d8";
+ sha512 = "8804542db2d736139718e45e5e549be9981469d4e68d7f6ce0a362289f8ab72994983309dfe1c6c0d1d73694b3b9bd726c13c62048397d8c865717596939bda1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/de/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/de/firefox-66.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "1c1ba73482b994d696bd7a37e52e999add6f9bb884e968730ba18b98e1c0f1067bc58fabe90223dbbf4145806939ba113abdd1e2203678cd5c3c4a938d7e3df9";
+ sha512 = "44e233c9023d574c0c9a24ac12e91311327b513d790efaddc76d46c869ca6297087039201e4b886575509e78cf9c4a6a18cc898d866e85aea5790dfab8674987";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/dsb/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/dsb/firefox-66.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "df2d9ea94b7cc8f2e0097d2cda51c1446b7574e0ba2d915cb86201bb75f91f6cd736e28fc136202883a56f835ccc3450077d1ef3a0039b1d26826d66e4408e6f";
+ sha512 = "4d5b87e5310655138f3300a0c6aae55bdd7a8bff419ca1798ffabf54340eb61981d48d17ad8bc9ca396271ed8e57afdb4cca0e1954a66daa8588cc2f954b8d44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/el/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/el/firefox-66.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "563a3af598c733d758e593a31b11382352704eeeb649ec9bc98e7e66acebe11c37600b25dc55a8fa5dc0e5993ac97d2967af3d0a87acbe54f898d4e2462affde";
+ sha512 = "add0ed575851a65218361802a597fbcd26cfee5fea3bd76f15c32f0045eace55a65158aa56d50039d1fd5866a34fb3eac091c3746f69ef6529fb6fa5abccb095";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-CA/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-CA/firefox-66.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "a8a1fae65e41d30b78488cbf2dce60fe6f4070abf6ad2066e72d6d123bd69b80939d2d9a50759a07236633e0e66199d568b4690c041013770ae1d3a0eb10f230";
+ sha512 = "f02ea6b747a8f3753de493820e21d0b61ab7ca6aa5de7d5b8fbdf9481ccf59d9ce79b3622b10ea13ceddb329d9369a857fbc972932f6b08c25bb9d5177ee4108";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-GB/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-GB/firefox-66.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "5a78853680bacb1769076117c5db0760cd714802f4d69fa571b52743bf5cfb66f2a22c344b71c6cde90df5f3a9ba7ae9a68e0ade747ab90ed4cb06541388353b";
+ sha512 = "0afeab9506114ccc8f64299633e19382c1038cef090d7a257a6cbf2b4d89986111c72b7273c7c803d870d05a9456cc8e761d2527d17220f8d70c97738068936d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-US/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-US/firefox-66.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "cc49ba1ac399dfb573bf691184d49f080b475b29473657989df35b1220f0bc66c4146d6fef6088f924cf58fa8cb22908a041e15fb027cea88f3e38b6f9fb3e3c";
+ sha512 = "ee23f32f5efe24652a21a32e23d39bf3ea566a9833352b99a051e56da2b9156852d36e922e8afd08c4910bb8e921d1a4e0f49d3dd34d7e0b369584572d7e62a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/en-ZA/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-ZA/firefox-66.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "88a7b7003d6896cde106befb505c54e1c652e32432f4aede6d325f9580e613728b1a9522a86149f31aa027c8e639bca5baacdacb49b12c852b6c024b95778851";
+ sha512 = "1165fe055f78c7cf6f7771869dfe710b7d55836a6ad3c09697252dbd7e79f9f597cb97cf733f1268b59f6823f2d456ec8b0af13fbe3c68cb3df8a08a57bab95d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/eo/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eo/firefox-66.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "d8b2d0600660efecd59b208d5872d450e66227b50510e67247715b47969ae9999f74813a4142aabfa7d51e725eb5ec5e043f151fd48a925466fdf708b259b3cc";
+ sha512 = "d3d5fd7ac3b89e21d857fd94273f1df7c1118f5be25c294b38cbcf0a6594afd51fd58a164df04e93aa991fea44e51c7fc974d44213ebde1f2415cc43cb242af8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-AR/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-AR/firefox-66.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "22362e1bfd29febced992d431bae2a1f9ae929d296d13a44b2fed70040776f89ab651b522eb3171a71d87947f9eea3a13dfabf0cbf35bc44ec346e9c0e9903b6";
+ sha512 = "77332230576e3babcb71b9ca74c14266733fed67a370d7adac8f0bdabaf16358a1ee7188211a3590cfd02a7cbc06e5e125b20f0f68468f3900e94d332a39ef3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-CL/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-CL/firefox-66.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9edb4071302ea0b8fe7b669fe39c305257ff8d70c3483a8ddfa7f104df33fd68522d993b2d61511649f8c10c7c65270d81e50e2b78b0f5313a232725c5e63876";
+ sha512 = "0a28e64b356f9deba612365ad615f2a5e5d0654ee20e4361ea7959e791faf60aa116f3bd3e451af88cb6738cb815b78cfd26e44c012d03aa624bad4e1257dd00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-ES/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-ES/firefox-66.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "58b7bd746c99df977813547aa40dd0e762fd509c0c5d279620cbc3eecd133e647c451bdde75b3ee588d08247054a6eb7aaaca62520b4a319bd893ee50d82814f";
+ sha512 = "90b18eadcfa5099785d0b46203866e575c4f065f9e70d133393caf5a1551c0f3e22051e274875e6b039b310f2b230e8c85af38eea722e50b357ab3eaf338f9e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/es-MX/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-MX/firefox-66.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "99d935a84faef492ff90916df69ce3873c34d3bf52eae3070b5aaf6faec3ca21b7d1368a7eca0e3749abd6716fdbe668ba9b3d0411330c1ffcbb384e8eecb153";
+ sha512 = "ae8bb311cae77f2bbb103a2221c42cdb26699c258fe077f0a5871068b66c8ca3cf0df5fdfc6ef58bd5ff91fbebdf519c7f319c9e1a6702cef9fc260c6788fd57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/et/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/et/firefox-66.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "f254877741061e688dcd20d2af8ad28e4bf055de203da5b4bd2f339b6fd076adc43610c359023b2bbc977bec79b431884e377dd671fbc3fca64db41d90137e4d";
+ sha512 = "45d48243b86ee2601368ff1a14e918aee4e5f02d3b2e6a8fc2b5f6c97ee76d7b2caad0131863a192651049e099688b3aa27308e121ed49cfc11a012c71978ae5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/eu/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eu/firefox-66.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "87cd272e8985f1cf09452488bf66e3abd8d6a34be327a2fcc9f6a43a3aac82637eab2f3f4ffefe8c04f4ecdb6b6fae751201ab81c7a69ee9fc5e0cb876c1988d";
+ sha512 = "9357f45c6c484adafd58a204a233c2620e3493aff2b5a1cae16dd8ca7f73003fb6f6d01bcfa8924c499a3052ac6a5aaeb7dfc0cca3d7a664a12219fd5b57b4e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fa/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fa/firefox-66.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "7db6fa0900c79051463cdfc88ef9b6983751c5e3709b5980204beac82418099e41226e6b56020f6c04680b44dcab0a384e17a99e9bc7b9aa052c020152f8fb4e";
+ sha512 = "72d81059001c37edcfbc2e994bff4f9c2dff57fff85a562d389789b8752931a898bfa058225b66868e17db9333449399d23f0043b1c4c102a92739f90e61be40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ff/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ff/firefox-66.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "3907e1b8561e6347190c8ff142467c936e03466eaeabb94bafcbe7cb36b087ceb7031228e6145bffe805f60ac0e91e8afbb02e4074e1f41dcf6811c7369114d9";
+ sha512 = "fdd14ec7cc8be41fcfd9f2013fd9ed032c119a34cba51642fa3c18cd8ae8ac138859218985a6481d0ac5aa974b226b550eec0f99ea1c62ef65da8c17ad019f22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fi/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fi/firefox-66.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "d23444590edd8b601468c2e85af06e0a86e1b2b582509b6acc4326b4d50140b6ab999d8882b9d7d85625cb465d05d0dd1a8a9be441ac0ca8bf43615fe65649f1";
+ sha512 = "fe15c43cff8159abe81ae0f51569d5aa4185d7583d92086491d694792c46b10520f77e187dc75379fbbe432da78d869172502e8b8fd6542f3f4d2641cc6df402";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fr/firefox-66.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "04bbea906fcf4412b07bb6d3d5921b69e12de1da3e5578a0e79df123cb37a3711a765c63ee5666f2e88ea1e2af0d478c9d5e3645f42f40382fdf8d83e92591ed";
+ sha512 = "9125d6bd70290423cc9913146707a50accd43ac1f05ec58257e41805d7a052fcadb25629926e0b20d53c2553476d58b9691f48f59538e68aa7b661ff655c6ca3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/fy-NL/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fy-NL/firefox-66.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "cbc5c6c0d71fcde09d2840d27cd431314c3c08673006fd49180d0541816916322109ed164fb2e2184175671db6a6119ef5bfd5f412f7d84f6b878cb6bc3c07aa";
+ sha512 = "b4d4ef0ecee7e0b0f8b429b7cb48641f6d8fecd89962587e5daee7ad43d18ef99c6a03292624ce634c1630f147626df6dc76713f3f9187b63a4ac501180979d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ga-IE/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ga-IE/firefox-66.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "92054f32b778ce5314d7bc42c2adb07a7a022b65fb2bc3d6134d8d67506bdb1c021de8754b6694ab062b7c502dcd0b602c82573d4ab885d3c69f8281aca0d0ae";
+ sha512 = "ec94b0dd54d36a78f7ab05901f22eb93c963b48e57b49253f3a3de6a7fe04de227f856fb82c4414d264143bffab5789a9eb3882f8d2dfa8ed6bc0c7d757e2602";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gd/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gd/firefox-66.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "c802e33554d8c2fac9ba30f161ade9d1b6ecf9fe5eef98d493db16a7dcb2e853e83d8d49a42b30dcbf8fa6f2690bd21f057b48dde8ddc4cdad6c0578b02680aa";
+ sha512 = "e283b895cdcb60d5cab1cdcbf64022306e2f7617b880c386096d800c634469f45543802f489a6160eaf531fb35e744d78b806990a776df27a150f06e479d4297";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gl/firefox-66.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "6abad8c99f7d92b01675bcb401e47d9891702b9684991f174fd93a444729f36305feb529069c5c8ef6e118a076758ad413bb30e921ebfae8358c6646a65dd633";
+ sha512 = "4db9cd8584f30e75e30545803d8dffa935fb75a2f091d20d213f3cf7a55ade3e406d066142d7c4444fe0ef9309f265320caebe07b669c253685c1a0fa4319e91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gn/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gn/firefox-66.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "27778127fad911b707567f8e1d7f50d16ba56a0287641551aec7d2692b4754be26e0f2592f4a805dc83cf91fd314f0481f5db3c23c682f6dda3fcce8fbcd6fb1";
+ sha512 = "73a5bd92ce989a62f060ae5be5993188b186b26ce3c818b14366d1fd1da09059d02e30ca239a32b74a4cbe2116c3965e5301ce42c2fa08b5af554b399b4cd6e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/gu-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gu-IN/firefox-66.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "6dbea6ab774b16ee9e07442fa50f32ceb2f9828596c8c523a2f47289fbbbbc30546ddb208128163c9de9800d8cd89c598a321454d8d5f58773ea896688459e37";
+ sha512 = "628e0460eddc0b748cb6968d096836a9e88e44ea43facde7b2969a7c262ced4aad51d97f335bd3ea26b378c102b131411d1de0322d618ed47025092647f02e99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/he/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/he/firefox-66.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "4a9a836b6dc45ecd69e7b9868f7bcf50c7e9c0d06d2cb2ffaf68cd89a78dee35deb70ad6668dc584ab8cddb05bad421129b525294ec880b4b8b5cc1bed19ea92";
+ sha512 = "315ec2d0af7bf39dd4aff5f7f3ed41b24d9726b3b02003d282dee80f7ab785cedab0ee0d47ef004c5b30407b72228bbc84ae21882268ae34210d5e5cdd9a3be6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hi-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hi-IN/firefox-66.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "7a76a3190102d36ca570131b6e480b5c3e5bb5f4c0fa794db04aebae6fc5d85f6cde9ffec3242f5e87c5d5e3c3ed0d0eea1083593f4cbef286cea708da9b0ff1";
+ sha512 = "63edbdae70206aacd70b777e551a2d2af8226c304f3d8c3052436749f71556f4a8f1d11a941f6918878de3d33491a0bbbd198da80780f7aae8a70acd1b8495ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hr/firefox-66.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "0b959d874a690a1cb77fb9d06f797a1b6b51b4b76e0506da310e77427f3bc47f33b3738c24a2576fe381b8bad3c95861e1c5456395f9b77317764ab81c40fbc0";
+ sha512 = "e65fce5ab014392710f9dfd4460db1748cc04f9b36e91d358bea411aec32494717956ff4268c19a3263ee296f52e24a9c9d83cd210f82fb090c1e4df7ac77cf1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hsb/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hsb/firefox-66.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "48a9225e25668779ff7f56c4292166464c702c7316d255d8060143e9902050472b617762852e2faf7b1e405e097c65cb8bf85c1fceda876082766b6443b5911e";
+ sha512 = "c0b164a380f86a90489a201c0e4fe5fed6eb5461a90ebe2b241beb8eeeb6680f10963e589dc52ee1568d9e25989514fbf8ba80c53c1cbb6c2fa931bede95e674";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hu/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hu/firefox-66.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "8115eb6cffb227930c3e42955f4f705ef5898485d568e064058372ddafae7005fd13d5a591f974f01b6ace7deb3196d52e8d2214d57db59ab69ff792df51c9e8";
+ sha512 = "6535c5b15f2321d8b69e6c59fd06b5029611e9b06bb4cc967741aa6edd9eba734f84776a35b6c76ea181481c965fcb452fafed80ea07973e9d6d5ce1cea01005";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/hy-AM/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hy-AM/firefox-66.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "39984fc44453d1ff2d430d33401ec76c6272d25aaf5026236a2053393a63fd467ead1a3af1fc5e59fdbafb56314cb16b46aa601e1a9843fe62bbf5a060558e59";
+ sha512 = "af9091a8868031fbc840a00bf584f5c8d868db0b308bb7f492a2257a16ac0c52bfac9da77b07bc4a575ca05854e58c8b892d4b989e199b50d66a4cfb5cf2f2dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ia/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ia/firefox-66.0.2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "93c248257b11bd9f06fa9125366dda8d7b11929e53935b7eb522f9ea26f3315bbe36482cfdda7f4d5af9d8c6276f14fbea1650168e54e82ebb030c7f7959cc25";
+ sha512 = "50a73f0d3260ba21698c59a1a806e47a8329d2f20bd1983d3201de4c0f85599698b0afb5c42239aa8b88bb3e1becd1eaee26643088f55b51b4c3830bde4828e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/id/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/id/firefox-66.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "89944b1e65f3a2e88629c4ca27112a78e1e3e597eb67ff7dd1bad9359177f6a59b47ab8eb3846a4abd1f22a0675f6915ef95af580c27a19b57a69757c8da9ae8";
+ sha512 = "e77b80bd36b21bea3c614c4e1b72d41b9fcccd24be0487b98ddb3d94db53ec703cea8103c1d5dd6f037eba8158aa1a3b9f22ae076f7acd9bd8d5b3743c56d7d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/is/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/is/firefox-66.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "e1eb5f27ec01e8404056faede53f691cd9159cfbec6e41aae3914d07c31925f24659b0a4f086223beb4d294fcc9fa6a7587fa71677f46fea60c696a541b502be";
+ sha512 = "9b3ee06f79c82ee4215f5a046102e0da4280e89948f5c15b3b8f7cec512b722f6015ee00fa961f2424fa3eaa9d05eb97bfa4514833c8607f8c856fc1ec15e719";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/it/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/it/firefox-66.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "c8cf1e4e60df22cfe20fbb549dd7830622cd183ac09bfc3123aa48f0079805d17c2210a0680d4722e7daa322dcad11ef06d2098cd51d5eca5060d8cbbc78b5b8";
+ sha512 = "4d03f5c013142361bac168ddc1f1b3195e6e095d281eeea6129d917ccb41007ad7d1c16ac30c49047c3b620ac4e89e6af69fe3ec2b614bb2e6f647e303ee6dd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ja/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ja/firefox-66.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "7c884be074ebddc9e8a1540006726a620eaf3533331a18cf40847cf86c270b009a89b976d57f3b7e6bd450b3a1fc5cde86f72ce94069b4199fb1aafa953bde65";
+ sha512 = "5cc48652dc4a23c5fa8f41568cc0a51da5fb6039a5235f6cce79362958b5b7ad0f04ef6d8d832d4d60c39b7802bc87e6e95f2803f2d07a98f7a66ee87e49a2d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ka/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ka/firefox-66.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "30c4bcf5c087b09338358d0bf92a990d6637307dafbdfbda8a72290b1851a3eeba595f66d2b245a47e2e789b7b27c3631ecb337847c3b4e9ad28f34549dc9115";
+ sha512 = "50277cf7e49d986746bf2075db7b4de1fba6a793731a82d7b53669cf9b8bc6a4036413611a20700a5e6cb91fc61be8189f86dc47e61a9c493cba17719f668c11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kab/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kab/firefox-66.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "2da34bd09264883010a038d975a4d09a63a530460c2b94034e16eee3912e9f014253f88273c395a5a59c33e4d058b08165ac8ffec6c92bd4fbc6b368d283dd74";
+ sha512 = "df71955a1ef801b49e86de2be14a9a1cdb325a45a8f9424829fc3333841b9019cc927aff9c7ece78b1e9e7df77f88cd899737dfa856a08e0440a6212acc8b9aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kk/firefox-66.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "3ea8a42ca879af580659f796fcc6ccbb23de9a66c26f8e37e207aee22de7090a8d68a33671a8d1429e35026be14d099d9fbc33aafb74ea6d31c2d213b01353f8";
+ sha512 = "ca589dc0d215d8b470f36b05312ad016c523fe4ebb54e37220ad1322e99b5ebf8a3874bce6d131ad6f7ff1008ff29d23393b347dd216bbb0776077a54f84b664";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/km/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/km/firefox-66.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "d150a56fbe7f7bcc7e5a28d13c0ce1e1ed6ad832ca9c1c07a9ee160482ff91f3ced62d6c78dda587e13020706fb5ea9d269393dada2a47412e95fae69347f24f";
+ sha512 = "46d8788fe845ebf00bfb7c69122e74c5345295aecce61d2903cb55fc85830378aff0280c297082f88a681c393c948a07593c402faeb25c2f22c301207087d930";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/kn/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kn/firefox-66.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "f75b51e80863b44773cd4b31d8c75045635f019c907283c765d891dcb9c6867f6c6d25a3ca00a7645128adaa73545b20c0e31bfd1779b099c59d9448ef3f61e5";
+ sha512 = "97fa909c1d3468c17a122e248758fca50a8979ea7cb964dcfddaa17804abf56b62af730665efdd45e9cf617f4ec3f238e6ffd9977a64ee42eb4dddbcf7fbffe9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ko/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ko/firefox-66.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "db9be13d844555eb6ceb746f5e75a76ec93e84de5f357819a0b999a1132239ef0cf3e4977cf6ad327b6a1989b9fd62460dd46d64bb6965b9808cf4f5712cd1f9";
+ sha512 = "56c3d254ff64554180a1fc6e968a653ecbf8e31403f37f211cc9a41fae9a51b21260d5804ab8c6a36c1feb2b479e55b3c568a46609b3bbd56ad05d47c6ecbe76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lij/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lij/firefox-66.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "8a56eaaaf84bd81df323490673add48b69132d6fa1c0ffbb3b3d39bc9a0269630f2e825332566446135356ed0ca9a456e05183e3d3330b8103ea622c2c66a1cc";
+ sha512 = "ed2eb3aa60089cbaf3d606959bb8b6f5cc80b0baa466796fa1e2587558bb0e1f62445760f2ecc93f83394a246555660e8fd253dc621ffb3f3ae55817e368d630";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lt/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lt/firefox-66.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "b84fe666bde98a53feaa0475d31351f792b9e470b3486749d8fe261e86993b4fcf782049503542ec0ae9a980a458044b86ffe16c0dbdaa43c67a9cd267219dc1";
+ sha512 = "b22a7db91c29a934dd1ec57bcc77869cd28baa6884e61b25c2b84e4dff5fac9d55e0a7e38f1e8301383644799e5dae8b7fa330d554a9309ef0b58a6bac5ca964";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/lv/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lv/firefox-66.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "ac0257115ea022c29098747337839fdf9cbec003bb0eebf56ab9b20ef0dbe25f0215bad4c9d55cc0178b0ec6f062d6578305d866f4eaaccf31557a23e336474a";
+ sha512 = "77bd42fe4966a7dffdf34470cd5657aba9aee81157a78a98a20b0200d71d11162058dfdb9d5a96f9d6648b0513cea3b5c97c8e59e169fe8e955e81c4578ac3bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mai/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mai/firefox-66.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "8299cabbbf37683afe6c5b085b9ec86277f2242beb42abf152872a738c9acfb6a43dd9876781567c4d9d4aa5168611c30feceb80a732daaf51564af4b689530c";
+ sha512 = "c110e1559f8f9972b4696c8ee463f813d5088d1babc62333060debf77eac52e7d5b96733bc82c8ffe22aeccfb30c076bba204dbd87890763f3e538a41e2fa414";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mk/firefox-66.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "e66020b52a450bc9afec362e77b12a1e718eb3bc709fe1b903919bb5a3d0644cd6b4c6e024c059308adbc123a034d26e72d9ddcd6e2ded47d3dfa66abe05d297";
+ sha512 = "57cfad52e649aa43add6f3d908c2f45005bb1e6cd298bd7158e4ed62013c0de053169e5f52ef4c4e0c5521a7b952b26a3cee8ebb088ef26f769a76d025f6f9ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ml/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ml/firefox-66.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "79458132dccec478d2eeec5b0824a46ebd715f010a7aca412c7cde67dd4f42d374f503858f3548eba839f2cdb7b37343a3466621a4e0c6dad4f10c65c237cca4";
+ sha512 = "df9c00947fba8e813895dab7f31d284187482a640d880841093e2638ae04c8f12bd8239a35dfd5d5ede4a219300306ef449295431eaa1e3480510b1e63a7e281";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/mr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mr/firefox-66.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "be68b4e0148faea1b9f4d20cdd3e6f8ca638a0988d31bdd8150ce5f6c2d436e2616dbdd196a900ec218e93dbaf657c0ec984da01bbe6ee7ec620f0fc149e1aad";
+ sha512 = "4afff5982f466eacb86b1a429e68a17c9cbbb9d7a6e59b3ca7eb33341fec9ce904a4289911a0f39f52d4e8eaa5996c3db97d1887209558238f241847a9f941ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ms/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ms/firefox-66.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "101031f8ad298b3e09a905e66a6e61334081f97ac703c1b93e38431be5acd0f667e8a6906663dda2f671db998ee4c180bf749b685fd204b03b4575223e02852b";
+ sha512 = "ba2b33574bebd9f34a0503f5c651837a3ea278eff635d486f99102e3f25c3130dc496debbd40d7268af3aa37d2b69a7b572eb7b794c44049bde1492e60b2c534";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/my/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/my/firefox-66.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "c63150470385ea9ea7957fec28f06069a2f5683de2fcedbae8550d3efb9a78aa60e78932960c820774f65e6bf0a99ab770465fe4c34c837983601aa4a4f1abaf";
+ sha512 = "bb5480f0d995512f274eab70ec18160714559f5dc36c937dd4fedea483c2c42964765863c696bf44f1bfd3491b706e14ac223817f1f97553c3968c6c8843a71c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nb-NO/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nb-NO/firefox-66.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "7f06bcd3f3d3f410bdd89ae750d4951d4d464d71846b46e25cebc5c256196582844863ff6126784628b6f00bd9e49ddc64b88f8a8caec42746c09a15e898970b";
+ sha512 = "cee130f0e6a4a18612b8e90fddbf923456deea6d8ba452a01b06b03e637c14b4131160f3bddf9f4feee05a5a675150c917e891b02c04a42234cda6229de12122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ne-NP/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ne-NP/firefox-66.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "e68b0d57bee14ee3ee73a29215bdad547ee77b506e3bf2bab4b1691ea0bb02e1fa9002c9aae07a139df4bd1a454e506cc2f98cb81f7d58969fc1d57123f81c02";
+ sha512 = "cc75630facb9471172e2419d0addc02b1afde95fbf43a53afca63bb6af353adc3dcf45ca7199daeb6e2db312c48ccdffe520b09d316f195f614f5922831791ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nl/firefox-66.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "09828f604f72821d0ac109f05d17cd5119045ff40adf9cf5d2c4a29da707e83b8628dabc3b4e75eda40494b386c60eb20fbcaf9686eda2edab874ac298636848";
+ sha512 = "8e45b9250267a95f583744c94dad0c7bcdc7c00e2dbb1d91efb8b8e56b1f2bff81037936eb840f68e83433590b26a1db18cebbe1dc2ce1f2bae05b65099492d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/nn-NO/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nn-NO/firefox-66.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "ebbbe599e2331a0f0016cfbf598cc3b7deaa9a377dcc4ed00dd6b92adb74b264eff35d9d110362bfc4c290a2a4193915d5e863bda8f5799c0ea502418814faef";
+ sha512 = "689c3ab0d66991573990ff8a3e1e7e7d878addc15609b4cab2b97faff6e8fe44513183f03dd3d23c22795e80e4028f18d2c329cd14f7e7808e784e02a1bc8aff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/oc/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/oc/firefox-66.0.2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "36f75eaf0bca5a298aa0cbb641d3da21a772f543a9f7ef4646f2cbfc64fdae0d9495402d6cdad326a1e5628dea3b6b36632a431acf2736a558b3c191cd5f6dda";
+ sha512 = "834d098342739e99bbb2ab1dcee997bfcd433d357962e25bc5ecf3026e2f41525c19b9d11ccf2ca0705590d23f8a13ab316f41a90e1d605dfd284421f502a6f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/or/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/or/firefox-66.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "2306c620846dca4dc23f004d1504f305897cc35d6cc43dff9e9e56fb51006ae29acba257a4c2d580903d65366838a3f5d1138b99be9e305e350577079c4d4e49";
+ sha512 = "62a696155aa25b6cc62885f15d29988b50b9a4e8d127ff259759b948be0c6b73eb99237116c188b5a46c638525e5890768a6d3978e9a1fad5a1748b917f2ea7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pa-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pa-IN/firefox-66.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "b308ed0b2176ed89b4c42221096161ff9c2e445312924b3b192e41dd96cf47c7a51273be6772e1eac75f3cd0b26c0ee10d56d6148f4e1c09a40ca1a3bdcf279b";
+ sha512 = "cc5a35cfba0b96a5d526196b2c56eba9a2cbf75d5bdf564bf85dbc6676849505c62f8e6d8c8a88cc5e6cb7f67d8670878dfe05a074d28bf895790efe7aacf404";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pl/firefox-66.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "e4484053fb90cafe00134ee7cf348afbab2d0a2373d93afc7532b054b029bfdf97c79147d2252f8fb88f914c2218aef6042ecb81615c4e495112d1705b4fb4f5";
+ sha512 = "1549a76ead00ecff081580f1fc77b31c3c7f57aa9d2a7a24231cdfd20f5ec12803ad61b04bfd1693a571f51e18ee9f29d51b5f60361ea5c5fcf7764b04ff102e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pt-BR/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-BR/firefox-66.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "5799eb14edb50b40755b79724edfc5e59fbb9f458ea50ef467798f49fc6bb128eb41f1aca6e402c1e8b3fc93a3d588a7ab845cb262db883373538442a8a363f2";
+ sha512 = "fec6c531e4ccdfce86c461744e4ffac4238ccb3c1e4134c09828e3bb171561241f9e683a2cfdb22dc45f674c03b0d59b212a242ac4344be2a74dca7bcc39ccd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/pt-PT/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-PT/firefox-66.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "853d7fca6ec8cc49911a36eddb7500c03d6da1487a2116a1371184a2d17d6e22f8b28c4079eade46ec90cb42ac6be68d5cad9015d5b458f635a88d7272124105";
+ sha512 = "ffb01c1fe171dd86c86617ecf752b196ccf48f6aa117ed86447a741fe82adb00fb908f2f7e01fbea57f6a2cd9c3dc603da47838e61c28a2e1e56a03df9497e80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/rm/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/rm/firefox-66.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "97a5438562da5de2b212890cd447227e5bb68caeb7d149941eb6064e5f89a15e17f8455134d0b441b6efa63c369452431ac211664d684870c90e416ddc4b2ac4";
+ sha512 = "941cb0cf6f67146216553804629001f317f0c3ca4c3cd9525cca819a73aac72b31bf62ed6efc550301b870916f2e697dca6d840d7495c1276a9a031e5c173ef6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ro/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ro/firefox-66.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "aa7a2838a893a968c04765f240bb423cf53e7e05e1f2271f25310e3ce456f40e170d580db78835a45f25a85008da1b9446191871e5345c6091e1be11004fb3ac";
+ sha512 = "53586bc5d4420435005fdb0f920fd4d7812dbe381119ca2f97c91cf60191c794070f301c4b65903fa3dcdba7045636e868cbda8f3e1e20592c226b38b6a51a84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ru/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ru/firefox-66.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "bb6e0d8ea567b685a43a3a15a592708ef7f42c97cef0da0673c8e466aa67a6b7d254d2916fa205fa44a88fccf4016a37749a1e56b62e7f4ee8558a662878242a";
+ sha512 = "efa1e8b1c63dfccb1bcd04c943e21cc7529de39ac710d1224588cb9f6e47bb0d600457e49510deb924bb9de32bb61c4aceb027a803e47c75b40f8b00c95bac69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/si/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/si/firefox-66.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "32a9c6c8af556ec052711c09d9b52ecfe9156556f4ec5afff65019f50f9dc108af9505fa6c67208034b90bc73b997749f829de913de901265f352778619886ec";
+ sha512 = "cf38f59d72961e3adf56ffcdde2cda6923b2fb09fbed09b3eb5b3bc843905773dafcbab858fbf50328e22f7b36c580d1e6ffe4481827cea006f1901fc04c9899";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sk/firefox-66.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "adcbeaf8216a056948f74ccf970b6ba1effa127efb0f9b024757ce313f047293feacf96418e1078082a7cd8ca769515f5e59fcf2b3195b762869d4563e8ef3ce";
+ sha512 = "e05c3b45a25ac44d3c6b46dcfb9214fb9c2e40453bf041352e10d6790ccc43a9523c541fa0aba473301b4a0298b74e6e74ee399cd65bcdb59dfdd1b2390d3fdd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sl/firefox-66.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "3a57061b607496fbc74305afd1dc531ec33d02f6486582faa6718b7b8d8f7feaa6f909c9f666da1276073ebeb44d550fd100389a9ab5acc8c5836395c36249b7";
+ sha512 = "2c1728a9f4f2754d8381aae570c61be4806725ed5913e16bec06d871f101454218e9165daf323d496d94ca3ada1e83e69d2b7947641082a70b99f98844d06650";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/son/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/son/firefox-66.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "2f13498703df28fc45eeb072edf2432099501a14ce4f4b2066b12b791ecc2585d965da79152c631dee0d29158135ccec1d302494683172aace10949b08b5506e";
+ sha512 = "b3752b9ae75efe0c9eca05f17bb5b9d9e62f92c6ed3fe2602c278f0c2c5e2916400eb1b077054612f21e63c0c26752ec2f03cc34820ff95e4e2d8efe66e15804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sq/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sq/firefox-66.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3b64ca5c46299cc324e3d75d5d76e111a3851048c98a1705647b853514c7e891977bef5388ec88098248d582446d01515685ba66e9edc4d9d20dc7e103f8996c";
+ sha512 = "056f6c4a5547057ed8ff3cbaa77d270e5ebb6d315aeabea9d552690eaa6f7c9a5365cddb5c5eedd07b1fcbad64b3bbadc9390c886656650018dd2cb690a29acc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sr/firefox-66.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "b3645ab35a9953c90593fa2d1ec1eac57eb539e856b68061f68aca42d5b872506a188186fa227d3059cd5ab023124bd47679451e231009d863496420e4914b5a";
+ sha512 = "aa8e8164be5f6c3d40af39807b8f20a4cc5dcbe2230156c60ba92c635b828a40d93918484350e27046464ed67cd3fc4e87ab8bbb0ff4d2594f7d916caa9b6806";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/sv-SE/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sv-SE/firefox-66.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "ec46567d475bed5cd26eb4011196b4a14f234ba6b260a8389d7709d637bb445e2dafd99f5fe93213a8a19055f11d565196879e006cb132c8b9f41631e6783573";
+ sha512 = "81936ab4ac5f876eea54a833c2f6c447a74ecb3636461b0334f4126f890aac36dfa77eabd9e16e8f9943ff40fc9a862ff2b1e2f3b3ed1eab51a6beb5516f55da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ta/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ta/firefox-66.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "203233bf73aed33693654a8318126c60fe8693d209a0892def59ff7cc3f67e0d1c3ab4433f030f7ddfd844137fb260b0f49e4b20016bfed9f76fbfe2fac2f088";
+ sha512 = "0537cfad54bec863b83e27a7a36c8fe5126cf704c6a5dcab3d4319a55b27533d66ed98b43a664ee3513b2e8e0cc96fd56126d4045a93db7487e76ecfad967250";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/te/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/te/firefox-66.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "ae3c3e5aa9af5a99ef9964b5c901b8433aa8ede65941492855cb4bcf15471c8214c25cf4a4962db8abe91523ff108fe8da9601a8f535a00446104b6612071703";
+ sha512 = "1084fa1da0cafd8894659636f7cb14498beac52adc92ab0ae4b9ca1e35517482a39a37d1d4906b4bc6a5a1ecb3c443681705582be5a2aa21745c767b0672078f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/th/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/th/firefox-66.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "e35ee9c0a26259f04c21fa31a8ebb6ba61a8c2e5a8f22e73f93415f96061ef2b2484eec83a81be5a88a40f47ad90623407b29890c0527b88f718a48fad4f8e36";
+ sha512 = "fa6a5eb637154f9eabd3d5e30eea90d17a2281d65bb25d283a91f36a8db05d615fcc633cc77845e29b898699d9b4c091aaf5d1f81b71aa2d60fc2007040068cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/tr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/tr/firefox-66.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "4ccdd702a835b63561aa16c9921543d5e1639a57e7f54385e7bde01106e77599e343fdb94c387290fe06684b8daba9a0ea8146da0b71b108c44bb8e7bc4e58ec";
+ sha512 = "a5df3fb13b78f1cc85bc0881e99390183251c4f8cc108e346bf257a2ca757a6232469e11e8c533b4722cc1381723fae7aa0132e3300bec500ed2c5e5f7070527";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/uk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uk/firefox-66.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "55382add864881c1102eafb37a645b8ea00e068db41085a677e02476aad5925e64f6f1a6617e3e40c5bf58c131dd074759cad317ec0ad5c6fd3c5095908b01f6";
+ sha512 = "7925b95cc4ac4b35bfef29d715ae21bf6f98ab7fc99bfda66f3514cc2d67f9a3f327bcb74a8e1545ad20918c8e50488ff0dfea478a08e9f1bc0c5d28cd8c9a35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/ur/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ur/firefox-66.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "c9b8fb563a85cc7d054c50e1d1b4b2f478ab6800c87fe345013591a94fe5ce9d0def2c7237a6497d757615e7f429f02701709b226cc8a0e2bc8bc645236ed1cd";
+ sha512 = "1fd3b03251130cf5b13a98135a5820379c4cf771ba2fabf0ae34d2dbfadca2b5d971c7c0db588fa75ba2594d5c88493961fde59cf743024bc31a7e2aba149b3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/uz/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uz/firefox-66.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "89901a1bdca4586c21a8d5cbd508b404c22328833cbea5aae92d0a503a603e069f612e61ed15edec607c12517f75b7c2a4c5a6b0c7140f1cdbcb5795430ff01d";
+ sha512 = "9baf67bb532ba992d9e28a59348836fcecab10bf793c2504a93822641fbcd3fbdb1922f4ed68cd5ab9783ca2c3a382360eb9eb50889bf3979e7f16b306320c35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/vi/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/vi/firefox-66.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "dc8a0241cfed23c449392b54fbf99a12025cb07d834505dbd712ceacc080aff52e0c139c89a5166aaaabd576fd9977acdf5d433022742047ab48c6a32ec344f0";
+ sha512 = "12afad955cc1674b89af3a8861c3746318fae7e3683ea35e26d3c2f0856c86bb154b860baadecc9d7bedb520e1dea6af0ef73ae420a2b551d5730bfca3c4ed23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/xh/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/xh/firefox-66.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "c5e3c29594c2e1fd29d30aa8b98625968330f010677515e41587fff401d0b2aecda31d55e1a3071602e736631d357accc62faf2d50177ba10692476c024dcd36";
+ sha512 = "e9f4f9576e9a0195c6ff8f67cca6bb3794294886ac2a71376c7bf9f8da824b7c15c59d09645e67fdb9f6371142b29d8cf3a45f80039ec405ad1ae837ca105764";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/zh-CN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-CN/firefox-66.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "58516ff9de05ffc315ff45332122e78010d4362d8e079e8679c5f56851b92d488399840f35469e9920a6c491ec7bec0854f275368fabe61bb4be68d6dc3a2d1b";
+ sha512 = "4b1558c2b211f9fb69b8b5f4559f1f35bc547a1ee65ee81ce4d9639b886f765fc97e62070cf39d425dcc8f1fa0d13b7c4dfafc3daf60b660b751d8904f46452d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-x86_64/zh-TW/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-TW/firefox-66.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "fbc313943d6640e74619110fbda3432d77a4de43814cf1d19b69132236ba6af86810d6618b71867b03c00e85a01fac26b8a104e2954d79eda8dccdc9e43a4dee";
+ sha512 = "73c4940b6fb87f3f98341bafd894189d9d24357fe3fd1ba28397ffae365f4883933fb759d90a385bb306269376cb2c30b4564e2fd585978ec2fdb73b657e3b18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ach/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ach/firefox-66.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "7bdbde365b86a33690e0eb44bebf479eaf3f4f226c23aba210569c0d0ccfa3f3cacdf3287ffe96f1799c84f9f1a91274fef4bcf6fafa472897a672f478160a21";
+ sha512 = "ad20dd3b682f6809f499349fc50131a016fdd424dc87626d151c7b9283d6ed1ef585c829519a434da39ba33a31f6a855628f5e6a950eff89b97465d4d6f97838";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/af/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/af/firefox-66.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "02bc8c607a10d34868e9564e1e07a60460ef8f07b2493e303bf051e7bf93fdbec31b65c9d4fd54666aa84a8dc0ae9cc87574b88b09f88b8dbc47d0c75822d5b2";
+ sha512 = "8151ed85053d31956fa8f12e296d5d694066b001f07648845cbacbd206e252fa4bb962f349472475feec99f6a26f30a2fc1e63000664bafff6dc83db7674bd7e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/an/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/an/firefox-66.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "c18a015c159fb1a93471246556ada44098f696cbab2ec4a6d46ebe34590af4ede6649093a8435643052ccaa258e578e232b07a290520dc9b398c167e57eb8bcf";
+ sha512 = "fcb83bf9b222eb5a6d872d6c2b4b7bde7ceb7e97ecf9c908d8dd90a7edb52a10378de453f8ef9643735fdf1bb6459610e77e4c05d14c9c594d94314d707fc222";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ar/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ar/firefox-66.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "91bfd2d01fff9a906f433f3611d985fe2951f2e179a9b2f00847f99d3889f3ebe2ab207a6f05f0c53379c21cf723ee8c447213f50ee23461ae9d1f01c3d2d77e";
+ sha512 = "b393dca33c937d282c7658a635808682e1c9829a2c7d567f5e8f854295a9dddbc88971c929ae7ba65acb9cdd7f31f6bb1d8b27fe93c3f74bbd82fde6022ca9d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/as/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/as/firefox-66.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "3006a90c9fd343797d9768f4922526089930063a78b999cce9b751ee2ebea11f8a1acf83bec3787b19403b968e7978f51a3e894e098805c90c02fe0786b7e61f";
+ sha512 = "d53e0d3f7892fe68434e6f5bfd4e6e894077932c0c757567c15a43495a2372a97015f0a78ad47dabb7b7bd21509373e9d034ec5db3d0ada955ada23bcf860467";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ast/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ast/firefox-66.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "df3b69f26544876ff440dc138a60e29971278df8913c27408c53fc8c2510374ba390a4a4feaedfd30e72121ae079584c34948eb61804d105ee37412fb795be58";
+ sha512 = "3ac14d571276b03d4ef74123eeb85a79a422ee9fbd014ec369e0bf7c8efe1d4d3f435897e72a43475e13e0a9ea4a9cfe277455e08bf85d70c2612357ec08a789";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/az/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/az/firefox-66.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "922866837ee79c614c37abf6b1351f186ca61a05506d891fb51021e6366f1317665e015bf3c0b846b38e6c209b80cf71f5cd6379528cd5064bebb6fe78dcc98d";
+ sha512 = "4894d809e0b3db5f01e898e14f396bb4ecb968e5d0129b55ccd3de31c31c50ddaaddd09742e092f4cc62969e70b5e4d821e1a206bd676d98b346e45e1510c3ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/be/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/be/firefox-66.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "9715983648ed356e8f929301daffa6850439edc7186feefdf0146dbfd5e29840075ad3b3d083aa48f5fdb82a387d39c39bb8fb92c8b286086a2ff8486313ba3d";
+ sha512 = "ac0d6cbd5ce46d1cba9405ad097291ff36038be8631b46703b0ed7fcb93cee6a88664d3c73216f6fc21ff3c16f4c02aae31860d49b9b894aac7b79b01faf720b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bg/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bg/firefox-66.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "521ba5736720ada48afbf5a912f87f207a54f30e525853649a1a2ec1b384addeb2badb3ea5cc2ceeee9a0942d6e998155ea02ede81dbd61db41df2e400605aef";
+ sha512 = "0c097df8470e5fe5241525662b262fa1f3d088c3a82c596636a2fc79b9a99263717a4cc6b06734e134511f395ee211f95985f287455541f71f09d5522a85807b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bn-BD/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-BD/firefox-66.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "87deffea882319d565413d6f17e97474fa7b1c8f6eb6a8a254c6ec0937e00e86db54f832c3480729fc934639be1ae214b4c630c7228864ef2f121692c88b1e11";
+ sha512 = "886bd3d7ede79f0fabba534a07abc26c44f58250f4ec8447b176562cf554aa988f8c88d6f8310cc00f431a9710c4d43a5396312546db1adb81cd40684b83887b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bn-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-IN/firefox-66.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "2b44479f6af89e42446c5bb7d48350bb4f74be5be58405e85588872e777565b1d0f65af72cffdbe04f9254320f9d5fd6e02915fe5089fb12bf54088547716317";
+ sha512 = "5a686bb6a1ffac5473056ecb6c15bfed19f58d118b0b58fe8a058a66eb3ff6ed9793aa5d67eda8357e7652127a887a244d1bb2cf218ba459e18a791b188a13df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/br/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/br/firefox-66.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "b914e9e7c296f390404cc6354f2245350c26febc10961774c5b779fd50dfc508e9999669ac9f9d51d57c1878cc07000c5694594921c2cf1111a355b78fe56f2c";
+ sha512 = "87b7e90a5ab950e428b0a794392b5458e2d7e0e5224982b78ce600adbbf89085e45d6ecf194837e9437465f10e01cd0405d1df99afe90612551af77510514666";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/bs/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bs/firefox-66.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "883337946935371223ecf64fd7b9e342b09c32601c8ae9aa76a22b922ae91b711424b59a65da41c8e71a78caa5e2e08db873d2aa34d7a1caa7c5dccddd1cd787";
+ sha512 = "80b0dfe3801ec8c979fb0caacccc6409d64b839c40d4ba0ca6fc114e4dd694299197a24b51138c734c0eac85feba9eeeb4ccf187622632db362b8ba4069b0e83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ca/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ca/firefox-66.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "84148fda78e1bf7ebf53bd27686e119bdc601a07e2aeb88564f795484fe0abc4545ce009b76b76ad1f21cb76912ed974c9362dd08b471379271fb39a0d8ed2a6";
+ sha512 = "7d186f282f82b73433f49bd9f0c3703ecf74d5cbca452ac2469123cd99eaea9f47e0bb46d4f5dba37f291fd0a7bff1136028651118a8b46cb362a5b41ae7e83e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cak/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cak/firefox-66.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "279c01a6223fb8c96f05cdcac24fbbebb93157b1f47c2885e25e0bfe3f42eba77edd143992abace5815f8e399bf668ea705c3e55bb6915e113dd13acd602ca78";
+ sha512 = "9a7c2bc579913f23fa0a9e52c077e52516c66afd5a2319290d8a074e2bce6ec86ec2648f45d810c26e2d60c0a6e1e6ce8c810bc460285eaf268f193e9034faf2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cs/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cs/firefox-66.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "48dcca86c1f3927a2ea223c8c5f9ed26d9e35b9070cdcb79c13cdb0e3c60e054c1a4070bc4b059509333dab78cfecad6b0e17daf461e695da7b8f472f71e4807";
+ sha512 = "1068f4851c0ffcd92cfec959ece7264fdb218920d805dec670c57648e59d10bef3a7df1a4de330bde7d99fc52211ee4f862fc9c414a6f2e096e63d4b9afb789a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/cy/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cy/firefox-66.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "107570a323480565829d6f393c5d396105a0df2898f3cb7e3a0087062a80834facf7c7461f45138781f5a9b6f7e8a17360b0db022da1aa62004057efa543456a";
+ sha512 = "1bc1629faef6fc5bfda6f294bcb6b97f120c65b9251128ba7157a36502ae8f22f9bce27cf0a32395f3e2a43e952a8fe2d509ddfc0e6e7f282d30a32310c68493";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/da/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/da/firefox-66.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "380cc253b1300e95fd938a80f85d6ab2dcde0a7a667879b102cf217838ec7abdb0aac89eb399c882f4095d2e8c93860e9d20f28d870a2c8b80151bf4d73481be";
+ sha512 = "b8fd09ae3071742598466eae89d4d038bde1c0a07d1849d9b25269806b64b22371f046ede66e130f6a249e7746d58553c9e79bf918e96a4f22c4d176304ebbab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/de/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/de/firefox-66.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "519257991f438d47e6aa52f07ef50dcf19107dc3c4bbb689dc4b02b0e5de013ee7a0708076264637c4d496b0a358bc940d11ae58d971ab013aeea0c05245a2ef";
+ sha512 = "226265a47392fc10a9c5638df606bc0cd47403410dd503ea1988dfca29a3c1f6a75ce053e2c604138a453cf5998489396ba5dc173993de5053f9bf0f6dd95996";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/dsb/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/dsb/firefox-66.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "dc770c4b40684b3d54df64f871b8121b57bf0cab931ded91e11dd909e408744a025f5b27b882b3e8f7c14c5ddd8430b5bdab809ae58ce5c0c748bfd6b315f838";
+ sha512 = "ebe9c8bb5f55ec3915bd1e53ff78005d8799d6ec0e3a7fd940394084aac0cd54fe8852f5e9ecfe63e15efcc48439849c6a8801a8c7127d4bddd880ed4b13b1e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/el/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/el/firefox-66.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "517c5aa0fc3dd904f4f66a2ea56dd83d2bb027e1745b35bbff64399548eb321a1d1a019a0821306f483acfba121dea1f52f9a5eea74341766f7e6830ef08ed71";
+ sha512 = "a54f1c2b0d38268a7517ae5436be6194039926d162e10c8deda35d328ad8b367dbbdeef00e727e504726d5e93bcc04dcb254bf92072022eee1b327735a3bc230";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-CA/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-CA/firefox-66.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "45db4c4042bfc2bd1886561962dfbfbb6c71488d138d58f942947463f0c2c82e2f2b13f1113d031f19b0b619437017c0db022b6393077d6b529b8390cc44ab53";
+ sha512 = "78bfae33a23334bc262c0f311a6bafd7e1175235311f7e48017173aeecce29d771b2f70223ce6f54bbb08a7796e18ec53c75499c4e6a821bc5890c14339ee3a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-GB/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-GB/firefox-66.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "51a02e9b02b09fc49bf7e2f962599873b9533d465fc7c9f7b5900586741e109812066bf67b6ec422c95a66781cc60d4ee65da139e043d8a8d9648cf8c83a48c1";
+ sha512 = "6119e0c74ce896ac4569efeb4660feafb1097162a908a68df0cf33cd5bea2633e85ee2149cbec2ff85bdb1579a055d4776b7d4c2473baadcd9c17a2e9cee1dc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-US/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-US/firefox-66.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "bf028f300e912e4aae0da38064f684a1fb0b21686507363c6dad4bed7e725ae68ffe0bdcf055f32106844484dd855716ca60cd42edd0c75166b6015250d3885f";
+ sha512 = "5fadbcdc7d39f21bb8c5051702a1239945e53a058fc61a2fffec0e51c4e31898b0ef5625d51c87612e4fcbf9fc8f3be9e18d6cb86e832d895278965a5c21e034";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/en-ZA/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-ZA/firefox-66.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "50b4017bd2bb74463248695b7ce2eae569eb47dd8dc7236b5c6bd9cdf88c386ef6847aa84c0883ca21e5a4abeb0b86f1fc44d30708d5ba338632f169979b1289";
+ sha512 = "7abc0ce1d718bdf2d3d1c47449ce4298194b061f6ef35c95577beb1036e5c4a2fc99bdaa145a888bcae0f316034d522a4766c7b1530e7b4b1c9b7a3066d2a771";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/eo/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eo/firefox-66.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "e4b9654cc3cb461fe7bb12e44807da92ecbf299964a5c1845d4f73239724e67945c91d10570be70e57d3f3db643543d6b5d4bc625fb4098947d5a06b6ebf7fdb";
+ sha512 = "67100d6438b6b7ca5072ed1cbce1b77387042f01f0fbef87105c535048e44cbe057996e5441879bbbe2066233a638e1b1faf8e880337bc2cc1488893d14a7aff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-AR/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-AR/firefox-66.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "0075ce52d770da93b3d1c61156124f483f5a52c445af874d2ae7122666590338c6537ec5f101ca9e998835cdead0104025bc29de8619fc893867388f961ca048";
+ sha512 = "4ec1451840a7cabac57feca4d62a572bc3719444f858a07d6b664ec649bd4a2f2f5cd78d9b30663ff1e2f6b0acfce864ecea60850ef4972f3ba00f42b979ecf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-CL/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-CL/firefox-66.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "7707eb290e9ecff0ca8876b72d9803c01b2127f00000d030c3f84c4d3e6720e27c9b3460bfd001e6017ea122d9ad274b7950509835922cb7e7787748531f28d9";
+ sha512 = "a75fda20a7c8c0ccdd5ab857f62c59b7e843d5f47ce5ea2aafe0459298606f4e66bbcab6e825134b7a35f4f7b217550b8ebcee780cbaebf5bd438fc382fc49d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-ES/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-ES/firefox-66.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "24cb5aa7cb7ab27bad12315611a0a355421d4d19b482473a7627afdb5e80579bd2061671c394f29e54b71699e53364d47b38cde450da11a090da6da1409723ae";
+ sha512 = "76d8438d349e1d52097208000d96e7994ff3fae46e6a3ed6db0977492b4ccd93b49104393779db6f85d5b8303c01bc1d30c93013536b68992b59063a931948b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/es-MX/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-MX/firefox-66.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "8aac2eae10062085b466d2e78b78e2366182b54d756cd397b45f075346350702e216a16d78205e3a2c7cd6b9b4f6274239e9001cc39ada4e74ca1beab025a503";
+ sha512 = "34cc6dc8bb07b76e322b3da263be6d91468634a08074da8000ad69a4ef3d93aa281996b5058a24f163db52dad7c73f7264c37bb6905217ddabbf8844076aa934";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/et/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/et/firefox-66.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "11418bd05482f0c6a7c732a372240c2a8e8d500a4297733121d2a4e3ab4235730abda3c87790d178b8e497d651a43c24dc903a89390939334d32564b9d83db0f";
+ sha512 = "84f6514e106ef5457e20d25497a93f44d6968ed3b44d513325926abbb7c3fa36db8c198f71631f28f03afea4d8d1994de07a2aa14fa64693196b4693e1820a6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/eu/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eu/firefox-66.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "f39983f48a6536e8ffbd6240080e525ff3922d943672a932cf1052b716fbaa5834a0330087b9e31c2fb39ae190162e799875a824d3287b9bd6a6b29f41a4b75f";
+ sha512 = "dc0713db71626da9224050e3af5f94158002b8eeba4ae0a5f7bcd1e837e4bb1850bc180bf77c35473d6395728397af15eeb0082570e9ef62b3690c73f84cd7dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fa/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fa/firefox-66.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "a592c822f244506c3ed1b285ccbb83998c02a450b36858930c4472750ce36ec94a3b6c517ab673e0f6cb7e419681940d48f3b85ee4a57a3b8ccbd1126c692918";
+ sha512 = "6634a79d9e3be0050fb4c13a8a39e7316084ee7ef48c32b826954133c516f271672f2b89f91d1e62af7ecdaebe33be3418a8a128b2b0b91388ff18d13e265207";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ff/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ff/firefox-66.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "05ed44fa04def5c68757c110b06362693395321247a9c259141a7d2d213b7b8d65f36b40f6cda00f688b648962dcaa79bfda18ab65610fb2e3d60f5e952f8eb6";
+ sha512 = "b5954d6f5ab4a3fb3c337a67a590513003d781825ff870f8c7a4d10bf73476f017141763f98e433c0f1ba6668f2a76ebcb76bca80e2b73757b3fb2abd98c1ae8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fi/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fi/firefox-66.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "50e94bd764a9a779ad9562224fe7483732b23cac9ed5ad661069edadf7217aea4fb3d1040d59233f6143a11b7581d2781f7d1f226353e28103cc50505518ac59";
+ sha512 = "2973860cce56da4e81058e565d541fa4f785ab8d567486f992e67d6ae2de60e334fd114adb6b584277ad6c01cd4019b1d1917c709bc1437ecd927c9d7851768b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fr/firefox-66.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "37ca249c1d4a1a7601706c36d3e1f17f2f9da0ad192eb4d0d1700d0b6094f4ff1567a84adad5b03b048b2e84138c9120d32efe07dae25db1ae23513907bb3188";
+ sha512 = "a3f58d4926dfb07c51b21cb900b654a56aa7bfe238c36eef104d66d72fb52b431a0cd5684fef6b20c8aaa6b89203116d6ed18a5f1ee0fa79879c25b64931fc3d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/fy-NL/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fy-NL/firefox-66.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "777819bcc97c694c24f1980518af16a817ae2d8e3bb9615fc68dc2a638ae28135faab1921d91c4bd3aaf9d7427badbc01b2680847abdb600dc807aad04fa6fdb";
+ sha512 = "c9befd42b54c68f2fbb5cac27b0c84f0d24691999a3d6547b946b574e959ce895a1b7dee37873f9ab19ab1cbe5f1a313d5b9bd251dbf68d50aa009d0a6952f68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ga-IE/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ga-IE/firefox-66.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "72f5dfbe99b38eb0b16a67d1e4621cadf7f899aa307e698747a123eb1b7cf88781209a21a8fe6d360f73e6c57b59778e5ff0deb2cc5ae63bf85a5d965aa0059a";
+ sha512 = "52cdf9616308625a57a56029fcfac0e0a31879b24112a946f219ae86bd72453e04ac8bfb910b387972b398b21e2f26cedb58a6c21867511261946de5bfbc74ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gd/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gd/firefox-66.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "cf9746cca0b3266b40bf14d281a21f0b5a1da0f991c943c456323b6d2a68adc19ef17ff900d24b10503030a26807149d29d2c9f6776ac584c9d7e851ccb20ecf";
+ sha512 = "e1aa8899fd0b14e34d195975fa9fcd08135dd4a9ba51bb315bf906d924ba962ce39e343a412cc2fd9a01a902ee627809512e9fc476c5630d5ae026feefbf84d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gl/firefox-66.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "5d6e0d4278163d8589e54fddbbfbf05281330003146b67fd71c009e39998194cf7b5a8ecca0851b1fb4cbc87c530c1ca3a97e79b0526e6ea3ecfed54a547258f";
+ sha512 = "bf9746a296fa402d3165bcca29257bf6953c49164dae50611de14fc0244c220d3904b0f24dfc1045849e12c37e30276fee9efe8f6a857833347987fd87c58e71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gn/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gn/firefox-66.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "6510b6ffe2142c31cbd97eb2e8fbf48bc9ef7b8d7c3ee7c9a4515f09ae94b056bebb6b76998056d3971f8b813b1f2a050176c85532f0ccf10b25a1b6e8bd8ac4";
+ sha512 = "1d320e4ccc4f2b8108ad1cd4d1427104aa76a5214259b70ccdcd3dc797dabec0839653e310c74967b99c60f017371db71b99aa695fc6dbec0a7a5db16906d987";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/gu-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gu-IN/firefox-66.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "0d6759d51d81406c3e06fefb11e88af5bc3bd452200ae56cd802f3fe070697ebcf3b2bd101266c36be5c4fbc95d5a4e9d97aefd6d97149eb59c58f73c2b41237";
+ sha512 = "98854b4e0d44e55c797a79df6a12dd473e70fd030f410944097f7ac3ca3ca50d80768cc627aa55cf8a686b47fa8ee1c15ea9c7ff89f0c4eaf2a1760515372482";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/he/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/he/firefox-66.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "5c66288f468f430c6bbd13a8dc55865d4822cd76c32bc6b28fd6d8f457e369bb24e97e68e9508ad7d80cc3a4dc111b4e3a18574279fbeaf1c0cc80c6e144f66e";
+ sha512 = "bfcfda4c361ef95c85ee3b90daa2b641cf0846e242d71321662000eb2e0319eccd01f0382df41053e10daf9a9a5cf97972ab00889d6f1eaaa41a83253e2261fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hi-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hi-IN/firefox-66.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "c9b93433b10d01c159c44d4fd34bae60f8c67ca4758b6d41e5f76588e2b636ec06d2739c3c8df09bd2799dc5a46e66c47684198deadf27762aad1ca141b8a217";
+ sha512 = "0fc7933d48d7a648780e7a0aded7912b92749aef7f873338f9eeac6c59e0fe86e997d69886bd2083ea987cf74b176e477ec70a33eafde3aea3f1492da1077c74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hr/firefox-66.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "51f3c3a6efeff7b195ec1cfcfaaf98f7c0601ed815e143d9a3d4d7523324812f81b05a84ec4b28e475c76994d4547a4a0282e08d9f3c0b3259c9d58e503e03fe";
+ sha512 = "0cf72ac981d5a2cbafd3d3b4dccf821d235c5743556703cdf2ba1405181342b29c3830b8693b54757404b8ceb3a51c7f8d1a812a26088f21954c37d308c79fa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hsb/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hsb/firefox-66.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "5cf0d71159709d4699102a6703f3161651a7d9b91a620e59843d8f519010da0013a508aaae515041c42a41a7c406df6234ff5bf4df8d9a97f0887dc77efc3a3c";
+ sha512 = "35d81a78827e8faf1f1f9b939427b2f7198e84aa841cbe2bc764f7531ab26e1e192d539c9818a0b7c8d77bf0dae15ce24bf805f0c7164db509f359be649e1041";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hu/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hu/firefox-66.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "a34cefa5e301450f670f5db22a87d0a3209304abbb973210cf646d0e27d36d32bb1fd8df608a6ce3ab1bf025211fd126c27279627f7f6fe22898c2a25302932d";
+ sha512 = "1d7b3c5cae0f9478b1a68d3c6e9bf4098a54579872fd38440e9bfd118151efadf35dd8db54441861bf4de11bbaf0358df74f26eebbfbff352de7cbaecd04a091";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/hy-AM/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hy-AM/firefox-66.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "521809c9b00eb31a5b7bc06f57de93a199a16dd1149d054a98ff7a0cc1591e44d048b7169d4642127bd07ca4e87a56cdb0967aeacda551ea407ee9c9345b7b43";
+ sha512 = "6d36b676b98c749ffc88bf831be7d9be27bd4b435ab32be9b61bf93edf69a3d8ec91a1b6ec2b16d1e5384c6cbea5fe3300e98d6212f5d3260cef121f75e24bc9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ia/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ia/firefox-66.0.2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "e37239b6f31413ac5f1f306cf835adf403fc326e03692b946007efeb09c915a24c0f1f696566269b444d5770eb4e170e484994920bc7c095b51805361d711f5a";
+ sha512 = "38a4baf9dd145fde8400a2c08f142565c41d6dd63ca4317c759e9dddbc76fdebad588127279b31becd0b4033c3d610fbbc6dee4ad3d23d4bee5c55904a8ef939";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/id/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/id/firefox-66.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "08149319789476ac435eae240dccc258045e7e45e63bd59f7df1c0feacf08ec705ad55338b3fb4ac167ee724a0a67e9e2ba78d7ac2ed7d708872ba03fbe3fad3";
+ sha512 = "06814d2b227ee60324a1e84a7e41b8fcd8e1b8ac35ffdd34b0d45ba528ca12a3d1fe9a60a14ce5b16fdf795f5c4d31d1825f3addbd8300c76fe0eb60bb29d52f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/is/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/is/firefox-66.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "bb6cb1368bece799dbcf5aa3347d44c8cc14e87594e97b84986b4cd794f88dad0c758dee0b556cbf825808aa090f36d4d57d1bc195c20085de02d71e2b955990";
+ sha512 = "f1b062932ee0b4ddd7aef3944d1d819e6ec0a2fcf4606ba62bcdbff55b13897a09265632c4f7451f673e82de0359e0dd2e927d3e538f32390d3bf2f0b794ce41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/it/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/it/firefox-66.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "ec637cfc94e72e34e46d8c4ad07c84c76299c26cb2a10321cf106cac0fa8a52cb95ecae1265262a80369d00080f457600e67fea9adb257dc570adfb167ffdfe7";
+ sha512 = "c4b456da77214a6a8e435bf347ecafa49e3513e0788f750ead5fc17218a5a52809756c02ea0c44d29adc037605b365651eb81eaaada2d21f0235865c1d585e95";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ja/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ja/firefox-66.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "5208a18f7b72faa8a33b3fc7bfc0a76c9dcd1bf2c1ce5d440b0e14a6898b83970a1fdcc3c1339c06b9fe18c61e0786f882e5e3cd527f8ef0f361ed49727676ed";
+ sha512 = "63f460ece90c5d360060fcbba81db3a62508f915608e393d0610ba1696ee030d81cee4654a25cd1e9e4ef374f3f5c1529d8945c38e10a6552f269beaf2bb71f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ka/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ka/firefox-66.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "2fb1dc95ef4df0b0c8f2297d8cc9cbf4a404c14b795a04cc135b314f48fd2affe351aff05447738c7a65a5bee6fae78513413ff548e83612270cc353dad07331";
+ sha512 = "12ea4c14139457b125fbd92b6e23c26b178637638d205a7f19c90818f97730bc7a1ea947ced3c3daa79bfded228d8afc9178c0cb885334db7ee30abbcb909beb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kab/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kab/firefox-66.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "4270a904126485cd404341ece8e4f0e526b1dc5bc9c04c73236df5cafd23ce3b97c0cd4fbf860b6abb940893041cfc5b9311294468181c7cc0335bd248d8a086";
+ sha512 = "64f1c0d5a332e1c7d97a6dfc2f3ed71f1824af41d849113daadcaff8cd9bf6b7b630a2b39468a6ac3599fa69be05abec44c9319658728ac2c666d22e0026ea6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kk/firefox-66.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "4f4e9eed0dddb80ae04e01eee3c764474ad07c20be00005bc095ec763133c5b634235f88d2b64742d29eb49bcd6cde8a2587ad9d270a441d8225e1aa76d273a1";
+ sha512 = "a4b75e4fe66d2e0ec08e87fcade8c990aac5f1be28a98f35aaa3f43a7064866ea5ab90a738ec30e7d00dc1111896a3fe3a976b6f97ad1db08177d73fddd60bf9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/km/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/km/firefox-66.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "5698cf9764c8df917f1b302fd44f58e258e78447e0f6dc8f4246aaf7cc3bace595efc35812ffeaa7bcc249c6aae1d62e7f254dddfd86405e34c7e3b4a95b3229";
+ sha512 = "026c8356efce7734a392f2fbaf8328f22b3a58e32bc8fd588ba73f7aab5f77cb0de2787db652abdedeaf79ad5c2628a84841f5b08e4477d911ea185f1bfb3fdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/kn/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kn/firefox-66.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "5c3d3b2a7c614b1484c2d143a04c6fee7af8b23cec5afe5b8e9a620a2d32bb65873b3b8a158a06240d93eedd6d5a380df3bf200218630aea87510a26d3881890";
+ sha512 = "a10623c4a3e123ed826129d67fddb74e027274440b7c21cbb2c8adcb50a1b7e486b6cc5f16cc8b07beed3e056d034f35ffd61742fa6e77f001fa6b9e5737d938";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ko/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ko/firefox-66.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "604d52890adf0041789ff4f9b9b64362745db504844482b949dd0d75622e2d45cc097e72c11195966c29cd2178304ee87a98299fe9e64f02009b27e8de6f2892";
+ sha512 = "a598ecf2cd1e6171209cf99fe32e6a9b981ffb92921a738237d1a7c7d575e284943da6cf37b531b3cc5ae3f08e02c2dea0d41a36f94147500977107d4d0f5884";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lij/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lij/firefox-66.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "3959d231d3486086b3fe8b28eb0d8650b2582a603236ac938ad473bd96103378cb395c0a7ab375e587bb1de67d567bdaf4ce03749049501a22e8a7d7f67b5f1b";
+ sha512 = "01c8ce34b83bd851d92bfa47c9d79dc04a17fe925a7d14d0a21e6f2dec7b467ac27c3ecbb48c6cd24254f435208123254ba23ed4b7f4230fcd1108efb597aba8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lt/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lt/firefox-66.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "ca8b8edd741ca6d0c2960b9aaf40df4bce62df81d44269d19202327436eedd3a329a721288199004015df9bc06953e8defbf577c2c2f98248e583fa1ad75548f";
+ sha512 = "ba92713101a02cbcf0f7851b9bcc623174101ef2c7d974fd6a7e47db812347f4319d5b55404a0d5c00707f3bc1c065ef98e0e7ec5112114bbb0704d10de2be80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/lv/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lv/firefox-66.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "a13b02ab06c7b1b813518a1738a9a2a718b3ca249a29c6de569ecc3621534743c003acca4b0fc748b34c5e802d2a0e47034e7c14a6280f2acf91289fe8f172cd";
+ sha512 = "eb9cbf6331da0cf7c1af6d1c69f4b832c07879631788cd4caac865fc9884cceb5f63fb63dab024ac4d4d2cde5bd75b90a46e38473e68cfc800bb2326555980b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mai/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mai/firefox-66.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "f7e9ced2cf6e8d832f92b515821d11b3fde29a4d47fd1dd912800352b735b6020b668c8dacc8870867c1eff4f89e491d2e7dfab6c5051aa28a7633038c125cd1";
+ sha512 = "78e1e89f86e875b31cccec93bc0e85b9c7c9952553724ccb7929cfdc6eaf7f0661d5d40e6d4494528953e30af80a9b83cb16b49ec555fb4556eae8f0e29cccf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mk/firefox-66.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "8595fa93d3897a6ebfcf2dacb9104fc691e573257f7a9d79e16e78db2c00bda60b05546a057f2867fd3a6ba6b44ae3cd34b9ffe5b22a5b3a7ebefb7ffc1891c8";
+ sha512 = "45c965b386a88f1ff266d6aa5b50adff28c5b8c5e60cbaca96133ded59eca8c7a9068179e4ba84ee35a48be949a59a1eb81f1b82beab5eef8fc21ddf5b387db1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ml/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ml/firefox-66.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "dbf33d9aca1155b69c312508c8dcea86d97d72b44477de02b7a94d1e63b7ba7bef401f2bbabb69adb192093dbeb9e7e578c69a250630f3749005738b1f67315c";
+ sha512 = "4785519f5fad4d1bcd3f5fdfa219eb0d9373db6d7187b0ccf57056718214206b9d1d73a3fb99f73403bf11bcedec360ec58b22640bd27c15e0ad981516a062c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/mr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mr/firefox-66.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "56e01bb0c39023630bbef1e6872e67e7c2f5b963c5876a93ec3cc1898e3b48bce0a07e2d5aee537dc38fcdb317737bf21a6c389a019f55798e6b7c571e7f6bf9";
+ sha512 = "54523da6bdc639c3a803a161f670185395f3955093cf4dcfce3e209e5c041af7c12098d1d9c7918888cd826d3e2aa63d645f363f5f82b7b6bfb8a845c35b3db0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ms/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ms/firefox-66.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "cecd972c19be690998ade7ac8634739aa1eb9c0b53b2c81ab701f7c39c96ba2729f7eb440e6b703bb5e084cb19f0bec81ed2e81bc17179ef2f72d64625866cfd";
+ sha512 = "916ecf06b7426bbb7583ae124c9400a8fd505d764fc190a28b906165737cb9e087a96bed97f566459574cb99e96773a1c458a8a3a97d48075aecee4b30d2f7de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/my/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/my/firefox-66.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "597592eda22db07bf4c6fe2a2b875aca8f8ed7bf65c51b92eb62f76489b4c75d042f48c5d8a4e91f9052eb939839ac03e948c479d7573aef8c0d1516fff57a93";
+ sha512 = "f1afaca5fea61cb66379c4fbaa3d1ef89438984ceeaa3eef687b43d5ab9ac00ae9ff8573289aa6b0cd353a11c784eae188f70dc4b314f45058362540e9cb4d3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nb-NO/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nb-NO/firefox-66.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "8a88590ffe841f672c01ab555bdad7ff4da0ba0e8b62273c0a4279231f6dd7e46bcae863ccf12291607309db161da81ef8c3fbe69fce532976530ba2262a07c6";
+ sha512 = "1a53aa28d7ad3b7aa88fe3014dec35b9ecf2995fb51e49a88574fcdc2ba08f421654c1c4458ea0ed7a9b1acf8d4c70269fa55f37c8fab92331b593b0b27a0421";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ne-NP/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ne-NP/firefox-66.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "166461500759c099006b93bc724f4e2c1d4916a34cb4476d95f5245e150dd4dbdcb4591ad3073cac418f0c35e54dab3c1f8767c468d7bbb548b255e60baf982d";
+ sha512 = "e9f402763dd04f2eb556ec6101749c1203db89305c3be56bf63931d3ab61230303f3b35718fe0aab896adab22248b8c5ecb973a1784d5ac10ea84c3efa0079d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nl/firefox-66.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "41bbd77853e0dd1487a484cba0ce6c58bb4303ca2b071e5b68c53452ef625263d8153de7b8368906fe91e5f77644c5ffc7b3933ec4812fc96bacf053744b8b37";
+ sha512 = "6c5e493e2b8d6a065c1db11c84850c462a5e5d68e0bbe97903f76dfda6e150a244236524f2bc82ef75850c84a2cbbdc9bebde4d587f24f3065eea071b74189e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/nn-NO/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nn-NO/firefox-66.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "d744b012829e3269adc91546dceabd122608a564454de64286dfe60686581a5a22c7d36ad6dc6f8f9b43e2d2208dd584aaedab2b3baaece4d75e986f6d1c51c6";
+ sha512 = "134ae8ffe1039df99e7eff2ebd5a86639d4b80b4d19b7382b2948ccb910f1bac4372d0a670faa0ffcf47722bea6c980238c00c338b4625adaa37927dabbde416";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/oc/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/oc/firefox-66.0.2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "63c042f19439ee55ce0e3e2952f277bda0870f6241b4a1f0c26e237e3df684ffbabe33f221a421d3a9f036fe0fcb57d6dde91b603a004e84f0662f77db5c6f55";
+ sha512 = "889ed30b46197a79ab9eeacdb72dac673dd3f584ed23a528ebfb3d2819021f7c08867503086c62a4cf29258a48ea2d370b0480d3096489d1d0596761a05c2b35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/or/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/or/firefox-66.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "c53d5e735452f52d81e21a8fb6410e56953bd2ebe5bb592836dcd267f85d93fafd429daa945add2b16ba6c0fa0502e93dc857a3a2ff91aed29c379773c0b695e";
+ sha512 = "57ad08fa2a598f58480e618d6d78ee691512594dca86d391bf1c9d87c6c06e3bb863b596c1812117c7994e06ec06936d48c81b0cb67750e117740b907ef528a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pa-IN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pa-IN/firefox-66.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "832d97cbf36142d6214967ef5c2759108a151f7c4bb549f6d2c4fe0f9b9659f883407e30d52ce548a050981190a61623db9b9ba8945dd6fcf22b2debb3e12b22";
+ sha512 = "f4da8860b36a06e8d7ed5e782f10a0181075b7f4ce85f75ce2d9009a2b5ac089b4df208ab29253414c1aba4e4d954866368b7de57b8f71aa894814008135f613";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pl/firefox-66.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "b4106df86061a1e13c72a8a68d2a0667a79b513f1bca9a6e6a625172f3721035f9522ed02148dd0fcfbde35457f4c4ee86d2120cf3321df1d6952c40d5af5297";
+ sha512 = "ab449c5f797218f92923abb9bb891ca2b8181f9a858c65515c72808efdf6535e1c0540a74b3038938570f210eca6be446edb2e4dd55e9a5f6e1a55f6d3fe6aeb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pt-BR/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-BR/firefox-66.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "b34681439be91184a6884388a536c7b7be98378138fea7c1aa9d5e5768465c52522818468eaf71458d8959a329565e217e59f95c0b433ce7a4b70059c373f4c8";
+ sha512 = "ce1436189aece0310f4a817bf838b88f5daa85c4c11ab14a93b48a6e7f779dc26c3a8ee5e1a0eb7d09a9d8f856c30ba0196e8ebb6e319883c917f46e7f5f4ecc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/pt-PT/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-PT/firefox-66.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "cb7ca8c8b63d5f961c69c665149e88fbf61d307de2f4a0bce0b0d2d2faf40116ef76779b1660f238346f57a883c18a0376aa504c5340c5b93574406f969b1800";
+ sha512 = "dc07a770cbdfc80a65a48882b3c4a96a74a9771ce75806956cefce7a5748c065b92cfaa066e7a59ff1c78a8584e06aeef96021ab9d22388fede1b824a8740fac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/rm/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/rm/firefox-66.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "97a8f3070bd5f1a2014433ba52a07a9ca4d25471a93243fb1bb64569f1fb241b013ee348acf422ed61c083ee170f011f9b25f6ce688135cbe05216871aef9adf";
+ sha512 = "507825359c936c0030440b3ebfafb11e344c0ff1e1b610d23c0d432265c5c5e1de9ce00f69fcbadf87295c4b29be621325a114ed084547bcf6de79e0fd091ac4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ro/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ro/firefox-66.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "40488a2621dfb609c1063027905694dbd01950969d3c2de7f256f12426fcf960ed9096c32898f9454e2bd457900b6460fabe51453ca632c7b2953c9838132b11";
+ sha512 = "89df1ca413857d9ba492bcfb460d0a9ad8d08ada7064b52a620a1b7534d7e2c063c5bedba6daeb25bd11f10360f4929cb4ae279ae9aca4d9a2d77d9c070cdf4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ru/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ru/firefox-66.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "fdcbee693014a253a5a35a4468d30b48e1067ab2463516d0c21bcca2dd049087890bce634eb028dd18dbfb757684f594c75b7046b68be2e95d4e1e6c5040ac03";
+ sha512 = "7bcb17030fbb31c5defa72341ec1d4f6194d2c6bb88636ce75ab4b4af387550915a3527aaec12b67bf7993b5bde4ea7087d59c0d46b62c5acde03d162f1fd408";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/si/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/si/firefox-66.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e97eff54787e85d616067d398bb0e34bb322ea6b2fbe98852acfb24a0e08c2694ec46937634123c16d0024b4cb9ca511317166dcc0581cc92286c4ab17fd8ff7";
+ sha512 = "ab54d6eb2f9e6d964b03c50d524d08e2906a6ee4e2161a516e26bafb4065b67cfe613782f57cfa4fb2e0f04204b62fd013ab6f75596d6f3f9162a24f6126b611";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sk/firefox-66.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "2bfcdb4f6e6bbda6d8e74721885b16cf32823459436bfe646fa1a9f473967e3f67edbfef53a32a36d40522fd188416adb122c79ec72703c19d3041ff62bddbc7";
+ sha512 = "db88ef36e7053594acdf0d46e42e948cfaa5e792e1782f9400343070aed8ace2793e482f25f7e1134ece6ca64ac27023b11888b012d74fc0a0af523a7984cdce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sl/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sl/firefox-66.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "a02f9f1e55e6c29499873ff53a7fed1e8ebb31efc2b7d35eb771598f724ac4bf01c50f71c8c6bd632f47bf98fe00a8352ea22a155089d9cfb046f5c5fb886719";
+ sha512 = "f98af8f8d38bed7b54955536a8d68de4dc49b6a7bf672c4fc9a5ccc85cd41e5299d3ab897cbc794f2427a0c44da5b54b855c4680315ce6d5b13f378381216a7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/son/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/son/firefox-66.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "9d42a89812f50ecc13134eab1377f7a3fddb2bf57a39aa3673ac0a6ab0154870965520e367498abb036844c24d6dd00a3299faeeb126805a990482a36ea78a6a";
+ sha512 = "e146a52b975fe95e5bc5b832a84ed352310f981ef87fa0ddec60cdd05c630db24f8661504a7854a17d26f68042021c4431e5c4199870fb26a060365d4ee8dfd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sq/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sq/firefox-66.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "296edc5903edd69a8ca727e44e4d13409bcefe81972e626c0f1b58749c6511e1504f7fc7869724aca7725c2ca1ca7044465d6308821ae6aa6c833d56a57c4a82";
+ sha512 = "0904eb3aa5ce9fbd51094b751220f33eb20a2eb5eaa1768adbae36d7caa1c9b1d69782e6392fac877297628f0a075bfa8eeac67c96884f40830d10254ff5f6bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sr/firefox-66.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "7ce8e3fc3cd3c402aba07e34b647c05de38879c7dca2b971f3883b0c833a3afb7f3403403c4993eba62279f5bea95562708fb4cb9452c3ae76cbf59b227ba830";
+ sha512 = "984c046333eae94afbffaf8a8b93dc141f77216fa425e3663656487c36056c45cc922fbd0e7173f6c271e1f7b3a3b07caa9d0a21881e6b9de3a9e86a5330d318";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/sv-SE/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sv-SE/firefox-66.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "942286bb1ddfec2cd4d8dea7012d1bfa98e0c59692cbd0b45dc7a0dad0e6872cd6ffa36dfcdadf5591894172f81aacec2b0c39c7d6be8fe2810666974b3b5364";
+ sha512 = "55e4fde42ee9b1bfbcf223d8e277101569e914d3e36f74c2dc003a22f1b7f36920a4e7cbb146ee72f6ec4edd90d6e0cf159bd74bd4725232b7e8fb61e9e838f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ta/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ta/firefox-66.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "7fe7c079cab423280744b03a55b1807ff7a8bf495a1c95ad7963b303ceaf1045711c33f9a4dc1b23f75bee0016448e54d9067c0d9eb692cf7b8a820375605c2b";
+ sha512 = "f4c00470d6bf3adbe864655b87bc40bbe018cd132204bebad3273f5454966540f724cd135fa53adc432c27fc5876245ba5cf0b9fca1887ee37ab572b7a74cb36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/te/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/te/firefox-66.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "35eea8679205d526b1f9a665c14fbc2b0570866ae7a1003429e01e109fd5ba5b0a63cff2adf4c88eac28b22b346fd3612a1a40f09d11f42649bc3ef98f34c6ad";
+ sha512 = "eae9d861788975ebd216d3775273c51dbbb6bfae08eda8bf883609950b1d28de38cb3cc16b48f3f93b15065e2c9b69b882077786398b4ef0794442a3a9377045";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/th/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/th/firefox-66.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "4db51c9f6b47fd30d5bfb4510f93b8032edcd06ec4f3dc76202d65732ab6cd4ef8eed4b7a500e51a9471d79a2d7752229e1cee2615c167b2419a84f5a039d36f";
+ sha512 = "f25178b67d23a6e04b1719c4553eb30bf6e2563c46ccfc42470d1127c59e4740bfb08589c7a2c034efb37d5b7962d10784ea9a131e265706959dfbf02ccb736d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/tr/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/tr/firefox-66.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "1be513d36bc5c92666f855efb3d556ac947be0891cb3761151f7da7d77b185819718450144ef6d2edf7228c42952e7dd968688ca00b8fd72ea947d8ebcba37bf";
+ sha512 = "9e57dc0338fc84eda2f5aaf4d14e185af061b853e81163b6ee4002e9a7b1dfbd3025d04073d7981e9983de5e27f81e4db3b23397e5083999d3972c02d1fac06f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/uk/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uk/firefox-66.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "2e70a372e54bc6b5e620294ee9cbf13000077ca8565f144bf43d3ffd09cfc57a5189aa5b23d6532897b28e7d9a724f4b21ddff869e02af405879c0ec740a0946";
+ sha512 = "7658f8a0a3679f1c1575d89aee699cbac41c5c922ace6cc9addffd0cefb5c0e6acd8b12797cf07ab1d75a08c8f3ed179af433ef2c18a9751982fba307340b963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/ur/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ur/firefox-66.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "21203b3ecaeb6504b940b22b70297c9890befafc3bf6eb1aeca5d3b8de93657ef50fcc953ac560d72ecf1a74f908740e0f9e4e581bf78ab302ca6ee0595c7f11";
+ sha512 = "499b74fe1d42e0680c89b9eb2c4ae6cfecbae6a301f531fd9a858a8cff181dc9bf36e879149aa503159dfbf292a8a75c0b62bad75bb196a5b8fb8c10e62f51ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/uz/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uz/firefox-66.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "d5e555907a5ff04ff109d38928cf41c87d2be748319bac6b64b1c70ca440315eccdd630e8a806b5ffc9facc12d969f3739a8917a01b01b05609268ed993e8b72";
+ sha512 = "84eb5a78e66afd9c64ebcd419eaa4272a699a1a0394cb4d45f148b149bbddd6e0d827f62b353d50b09dd0ef6c111278eb7947bd1bebe38dd0da0b6522c9221b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/vi/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/vi/firefox-66.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "0db81ab14f46cf76b3ffdbe0425f6ff2428dd214f4ffa9c3a623f218bda7483f78d91accce28004e3afc79475a326597bd9d4f1ac2150592ddbab7251a654aaa";
+ sha512 = "cd8ec1c51ebf079aeed69f5875549727851f3999a26d75ef4e6b15f70b4a746f8dbe29f2527e37c4b3b4ad2d83972ebb7e4781b4d9304e6d09939684bf13a23d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/xh/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xh/firefox-66.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "14ec22f2b54f1f01bdab932b9ee344275bd89c36b755252629354e9440e6cac1509b18519519322920b96f043ad2a64fc3477c68364787db7ba95ae9af0fff9a";
+ sha512 = "abfa5c22d001e5f8298b29b53f6864f7ab2745ae474b113fb5ec6fcb3ea2dc27b1c98abfd0e55bc9c0fc0e43be55a362264ee6f7ad2938dc846826ba6e4ab516";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/zh-CN/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-CN/firefox-66.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "5af1cbe3ede86f3d848e9522ef5b29b269a19602973f961f5fe502643757187e91c1a74ec83ff270da7e37a3e86280e42f8ceaf8233c71cf75c8532f619c4d9f";
+ sha512 = "c9e536e63d06f8a1a94d881008ad5d645cb56fd3acd40ec473ee0f0ddc1957ac567fad96057d27ad00000ac40da06c12f8422f743f37bb9a51ba56de214c13ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.1/linux-i686/zh-TW/firefox-66.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-TW/firefox-66.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "69a449be2defc350fd719ce907ba61f9b58fd90c190c9f1225f4f3385b144bce48cd063ce3d0432eac32af82b072d3105fccaa88cd2e3894c3790280e1bf1a9b";
+ sha512 = "a47432a5f5c7e39ff66c2c832161f3105dea259d15a9151ffee8fec04fad3a6760ee06bd4828f7e361d78a1bf08163f17014e3389936ec60f1babe764d263371";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 54703f5a20f4..15de1a763d90 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -251,8 +251,10 @@ stdenv.mkDerivation rec {
# and wants these
++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${tbversion}"
+ "--with-distribution-id=org.torproject"
"--enable-signmar"
"--enable-verify-mar"
+ "--enable-bundled-fonts"
])
++ flag alsaSupport "alsa"
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 2e5ecfe58fc5..8b7f15ca7ebb 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -10,10 +10,10 @@ rec {
firefox = common rec {
pname = "firefox";
- ffversion = "66.0.1";
+ ffversion = "66.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3nh42a9s8hzs3823mddqdcrhjb2nrphaz9v94mmp4xx4vra18mhsyddszk6xg5mx33wamvlalicws6l9h1d4i4dnnpchh2l6ch8m9kc";
+ sha512 = "1dzqzigrwb7q75zlyd74ncic3b39yvziccpgbzh7881lzshj7x6f2r6ssj8ssdkh8lm2ckhjzbn6pf44vlh8ciql9bxb8g8sjpg6ii2";
};
patches = [
@@ -232,16 +232,16 @@ in rec {
};
tor-browser-8-0 = tbcommon rec {
- ffversion = "60.5.1esr";
- tbversion = "8.0.6";
+ ffversion = "60.6.1esr";
+ tbversion = "8.0.8";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-60.5.1esr-8.0-1-slnos"
- rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf";
- sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1";
+ # branch "tor-browser-60.6.1esr-8.0-1-slnos"
+ rev = "dda14213c550afc522ef0bb0bb1643289c298736";
+ sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz";
};
};
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 2f8f020dd9be..b6ccfdd921db 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -21,12 +21,12 @@ let
in python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.6.0";
+ version = "1.6.1";
# 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 = "1pkbzhd5syn7m8q0i7zlxjdgd693z0gj0h22nkc48zjkn214w236";
+ sha256 = "1sckfp9l2jgg29p2p4vmd0g7yzbldimqy0a0jvf488yp47qj310p";
};
# 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 3c1273876002..283c63dcd6fc 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "8.0.6";
+ version = "8.0.8";
lang = "en-US";
@@ -99,7 +99,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 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7";
+ sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi";
};
"i686-linux" = fetchurl {
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 8c8212e9e2c8..2c6940e037cd 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -340,9 +340,7 @@ stdenv.mkDerivation rec {
`tor-browser-bundle` needs for the bundling using a much simpler patch. See the
longDescription and expression of the `firefoxPackages.tor-browser` package for more info.
'';
- homepage = https://torproject.org/;
- license = licenses.free;
- platforms = [ "x86_64-linux" ];
+ inherit (tor-browser-unwrapped.meta) homepage platforms license;
hydraPlatforms = [ ];
maintainers = with maintainers; [ joachifm ];
};
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index d6e703f79d05..19194c2d0873 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kompose-${version}";
- version = "1.9.0";
+ version = "1.18.0";
goPackagePath = "github.com/kubernetes/kompose";
@@ -10,14 +10,14 @@ buildGoPackage rec {
rev = "v${version}";
owner = "kubernetes";
repo = "kompose";
- sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86";
+ sha256 = "1hb4bs710n9fghphhfakwg42wjscf136dcr05zwwfg7iyqx2cipc";
};
meta = with stdenv.lib; {
description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
homepage = https://github.com/kubernetes/kompose;
license = licenses.asl20;
- maintainers = with maintainers; [thpham];
+ maintainers = with maintainers; [ thpham vdemeester ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index ffae170a1990..ef31898dd0c7 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.13.4";
+ version = "1.13.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1q3dc416fr9nzy64pl7rydahygnird0vpk9yflssw7v9gx84m6x9";
+ sha256 = "06pf4h76zsqs3dsxr57y9sb9sw48nfyw1x2q1725zww61jfz2a6y";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 13c7f59f7944..4263abf0771d 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,9 +14,9 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.35.0";
+ version = "1.0.0";
- kubernetesVersion = "1.13.4";
+ kubernetesVersion = "1.14.0";
goPackagePath = "k8s.io/minikube";
@@ -24,7 +24,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1qb342zs50sdfvfb8vbn7vrx11qqjy1hw518c053s7p34ljb24qd";
+ sha256 = "170iy0h27gkz2hg485rnawdw069gxwgkwsjmfj5yag2kkgl7gxa3";
};
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 84e48ced284c..ef0da8e6ff5b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -11,15 +11,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.34.0";
- sha256 = "1vcf3jvwn7vgbsyp6lqibh3yy301sykjzl9hgzzwxg4p1wq6i038";
+ version = "1.36.0";
+ sha256 = "13rmlsnplcmcxjksm1wizgzlx47h5in5gmqhbm2n6k5ayx4x9ha2";
};
archive =
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.1.0";
- sha256 = "1fsynv725cmqz819v9p4i4h4w4y77mbya5y9v81sqvacqvr3i05h";
+ version = "1.2.0";
+ sha256 = "1qargj90nl7r8a1fcsj10fnjirskvbn3gz0dsijqnr432jxs2cvh";
};
arukas =
{
@@ -39,8 +39,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "2.1.0";
- sha256 = "1gz7y8k6x3jg8jqy6n105vg2p4vj5zayfhand7xi82w0ykf8kipn";
+ version = "2.3.0";
+ sha256 = "0cim14q56xr7hm06d4sy205p4xp1x3kbddb4pw65ck671i55h7ln";
};
azuread =
{
@@ -193,8 +193,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-external";
- version = "1.0.0";
- sha256 = "1sh0m8d6wp76h1b89j820yl3caji0f0wlgq3pwa5nk99h73rlndn";
+ version = "1.1.0";
+ sha256 = "18gwwcspj31rid0r603z0688nzdwl2nl8wy6hrzw62bx5gy4bdrp";
};
fastly =
{
@@ -228,15 +228,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "2.2.0";
- sha256 = "1cnybx6gbd6yfl8nmk2i0k4wag1x5srq927k3ayivr0jgk01d8cl";
+ version = "2.3.0";
+ sha256 = "063z08qamy0yx376qh0pxd446kbnp6z1828x6nr7yzh4dw0rzc3s";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- version = "2.2.0";
- sha256 = "0m34qas6plh4pchp9vf0hnb3f07y8lzywwmrycfllqg6f7c38869";
+ version = "2.3.0";
+ sha256 = "120vq5bd092ykv6cc53w9208wfmf2hd8hflas282l4yg0b47gx83";
};
grafana =
{
@@ -249,15 +249,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.8.1";
- sha256 = "07s2fgd9dxajqj0w7pyma0fz5q5a96s7hbpmk1pmbw9lqvxmabgf";
+ version = "1.9.0";
+ sha256 = "08ag1xwn6vj4w8kz37z8hsi8lkvfwkw5n8wjb5c03g9yva1j85yx";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
- version = "1.0.2";
- sha256 = "1zk93iv57f9b8qcr1byhpxjpf1mxpbsd94iyv5k5r2xzw53ccv7q";
+ version = "1.0.3";
+ sha256 = "0kqnbd78m4r97b5w7skkpcnhc0bqh2cky7q0inhdhsb7gvivz1b1";
};
helm =
{
@@ -284,8 +284,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloud";
- version = "1.3.0";
- sha256 = "1pm2zfss20spfwqidhn04hcq4nxxamjkn6xv8vxm3mgrky1ysvp5";
+ version = "1.4.0";
+ sha256 = "018b57cndl72vjlijwvjx64rxjgimcqq1f6dxdny3wj1j4i0h4fi";
};
icinga2 =
{
@@ -333,8 +333,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "1.1.0";
- sha256 = "1qxfyyg8k43rw0gny4dadamc2a9hk3x6ybdivifjc17m7il0janc";
+ version = "1.2.0";
+ sha256 = "1w63ar3cr4095kza400chmmdzdadb1d871pbd14pzghl63nyg4ig";
};
logentries =
{
@@ -375,8 +375,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "1.4.0";
- sha256 = "09asrq9y0l49vq3cg96zmshdpgv7dgkvi2yda45cqz04bi6jvszz";
+ version = "1.5.0";
+ sha256 = "1if8i435v4nf18hdvwwz3nvlkaf8yjzcxi300blri2xfx95chsxw";
};
nomad =
{
@@ -389,8 +389,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "1.1.2";
- sha256 = "0ayxw40yg0k64i3y4hsghzyv3q3bqr1y142y7mc2xwnvgvgzzg98";
+ version = "1.2.0";
+ sha256 = "0j9xghm84zjfgsmix1gdslr4pnhcf2xmb7n1851a3pmxd851fd9b";
};
nsxt =
{
@@ -417,8 +417,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.18.0-rc1";
- sha256 = "08i08lvvi3i2xyz49yk59k9qsiywds9l0cp6xijj16vkkgwysiw2";
+ version = "3.20.0-rc1";
+ sha256 = "07z4bl2fz8wvfjznrci6dxigx8ypi2r4w8xk9fv0bpjm0a6pp813";
};
oneandone =
{
@@ -445,8 +445,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.6.1";
- sha256 = "143sbfhc44bw21wa86lyd2m7vdihhnqs7grrdxpmw4w7bcx9sql2";
+ version = "1.7.0";
+ sha256 = "15p5xvl6ryj5silpd2yrmjjh0d4qf89v8x6zbq8x7j351a1fljak";
};
opsgenie =
{
@@ -459,8 +459,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oraclepaas";
- version = "1.4.3";
- sha256 = "0lyz2fjs4hr28ymx1qlzp93r3w4qn74bglipgv5mf55k543dmwdz";
+ version = "1.5.0";
+ sha256 = "1vnaqzs7i2kn37sxf1sknxn6j1d24xlckqcvkh9xzi8jrmm4rgvr";
};
ovh =
{
@@ -473,8 +473,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "1.4.1";
- sha256 = "0wky3kw3vhb1bn7n7h03nbd6n7bz1xbmygs0ipnkgq4qyzydjrhh";
+ version = "1.5.0";
+ sha256 = "0c59f2q8ivdn47f4shy674794aijc7byb6273lfcdaal1gb0mw79";
};
pagerduty =
{
@@ -508,8 +508,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
- version = "1.4.2";
- sha256 = "0raz070sj5csyqn3gav1a5p5dsbrym9ba8nfw43hbnk5ixxr0izk";
+ version = "1.4.3";
+ sha256 = "19rqqx5ib23nhvz2smh20cii25g09sdi7kg85m4nlbh63gqg86qf";
};
rabbitmq =
{
@@ -529,8 +529,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "2.0.0";
- sha256 = "0plg139pbvqwbs5hcl7d5kjn7vwknjr4n0ysc2j5s25iyhikkv9s";
+ version = "2.1.0";
+ sha256 = "1219128f838szcjgjv6figrmh4r7lhxrr22mf9fpf5a30wi0ssqf";
};
rightscale =
{
@@ -557,15 +557,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.8.0";
- sha256 = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2";
+ version = "1.9.2";
+ sha256 = "0wjkjf4sc3rfxiz3lfw6cfhdn8a7pzmyfw1f2dsp3a6fpa2srbph";
};
selectel =
{
owner = "terraform-providers";
repo = "terraform-provider-selectel";
- version = "2.0.0";
- sha256 = "1yw1526llvqc3ibrmjffan2lvqas99x93h6rlz9lrgzylgxnqaxy";
+ version = "2.1.0";
+ sha256 = "078pyml9nwv7347yni1h7mjdp8sd4zyccv80mgjn8xh2q208fqpg";
};
skytap =
{
@@ -585,8 +585,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
- version = "1.8.0";
- sha256 = "1j6gab5vva21m01p5gh0x1p64jnx9ch2q3zd4f1s8ch9mba6zgsl";
+ version = "1.9.0";
+ sha256 = "0rpkxg50gkm9ji7s4bl1wz7j1z2iw5jq9n1pfmcs9nk0rl17j77j";
};
statuscake =
{
@@ -627,8 +627,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
- version = "0.7.1";
- sha256 = "0iqr1r4fd14c9fyj4f21kmnlypxsdi1w787gdj2jr27acqkq3pqh";
+ version = "0.8.1";
+ sha256 = "0an0il8h0ly639z92cc007xjjs3cyk25jkbnkp99kkj0mf760729";
};
tls =
{
@@ -648,8 +648,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
- version = "1.3.0";
- sha256 = "16mnkm781x5ijbdcsxc56kw7ppag4js0gmlx64ry8fwywm8ma0pp";
+ version = "1.4.0";
+ sha256 = "1nl6k2313wwdzpm2n29bab9xs3l00vyhrdl14r82kax6hjm748qm";
};
ultradns =
{
@@ -669,22 +669,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vcd";
- version = "2.0.0";
- sha256 = "1h4zcxbrg6j4xy3hw84f9mmnz535a91jgxvymnrjadgm91bn6g8s";
+ version = "2.1.0";
+ sha256 = "0azmjddysl38n58vk94zhm2g7s5aw71gvn83h4n7amf2j7p7ks9j";
};
vsphere =
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "1.9.1";
- sha256 = "07pxzy8fw0n0kq9mf43bz4cycbwxp8vy0jbl44sknszmzbn4pam7";
+ version = "1.10.0";
+ sha256 = "039s95afqrcpf6jiprqsqnvlsnxbs5vcqrsgg6pbs52rlwp1ixgw";
};
yandex =
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
- version = "0.1.15";
- sha256 = "03ynfzdlpl5z7lpq5yisqkzsk53lfz71ss30bfvx0q3qhv7514dy";
+ version = "0.2.0";
+ sha256 = "0y7pnl47dg83i7r95gy8h1ayilaji2k5i048l5pkavp1yxx9i22g";
};
matchbox =
{
@@ -714,4 +714,11 @@
version = "0.2.0";
sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
};
+ ansible =
+ {
+ owner = "nbering";
+ repo = "terraform-provider-ansible";
+ version = "0.0.4";
+ sha256 = "125a8vbpnahaxxrxj3mp0kj6ajssxnfb6l0spgnf118wg3bvlmw5";
+ };
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index 3352fb79f1e7..c5d6fda16514 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -20,3 +20,6 @@ tweag/terraform-provider-secret
# include terraform-provider-segment
ajbosco/terraform-provider-segment
+
+# include terraform-provider-ansible
+nbering/terraform-provider-ansible
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 561c405fd808..8b5f1ce3425c 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -3,23 +3,15 @@
rustPlatform.buildRustPackage rec {
name = "newsboat-${version}";
- version = "2.14.1";
+ version = "2.15";
src = fetchurl {
url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
- sha256 = "0rnz61in715xgma6phvmn5bil618gic01f3kxzhcfgqsj2qx7l2b";
+ sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s";
};
cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn";
- cargoPatches = [
- # Bump versions in Cargo.lock
- (fetchpatch {
- url = https://github.com/newsboat/newsboat/commit/cbad27a19d270f2f0fce9317651e2c9f0aa22865.patch;
- sha256 = "05n31b6mycsmzilz7f3inkmav34210c4nlr1fna4zapbhxjdlhqn";
- })
- ];
-
postPatch = ''
substituteInPlace Makefile --replace "|| true" ""
# Allow other ncurses versions on Darwin
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index a22b72b2f1b2..464722612c7d 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
let
stableVersion = "2.1.15";
- previewVersion = "2.2.0a2";
+ previewVersion = "2.2.0a3";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
- sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28";
+ sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74";
};
serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
- sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9";
+ sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56";
};
}
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 47270cbcba8a..15e0b5a07b43 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
- sha256 = "0sjjlfndz8s78fl7vb8alz3nsksjrm4hbnnj11xa0i6k16v6pv1y";
+ sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy";
};
nativeBuildInputs = [ dune ];
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index edcf154dc77a..aefde289db59 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-3.5.1";
+ name = "bitlbee-3.6";
src = fetchurl {
url = "mirror://bitlbee/src/${name}.tar.gz";
- sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln";
+ sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz";
};
nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
index c71db351e9d2..64443461e375 100644
--- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix
@@ -3,13 +3,13 @@ fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation rec {
name = "oysttyer-${version}";
- version = "2.9.1";
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "oysttyer";
repo = "oysttyer";
rev = "${version}";
- sha256 = "05bfak4jr8ln4847rkj5qkazqnjym65k1phav3yicbyr3mxywhjw";
+ sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2";
};
buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 2201efdc028a..7ce41d9e27e4 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 = "1.0.3";
+ version = "1.0.6";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1gwz47wi9g9g9zzf46ry3q9s855rvlcjlg3dsxr1xdvz4arci195";
+ sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index f78e7bb99299..116e4917354e 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -57,11 +57,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.23.0";
+ version = "1.23.2";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1bdl2najrbwvfbl5wy1m8vlr4lj6gmngillnyqlxasvjz355rlwr";
+ sha256 = "0nl8rv0lgp4cwv029kl7y09ngcrik2657m4wjn0rnls8kpmdhd8j";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index ece9c1089fad..76880c92c133 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -5,7 +5,7 @@
let
- version = "3.3.7";
+ version = "3.3.8";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -48,7 +48,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "1q3866iaby8rqim8h2m398wzi0isnnlsxirlq63fzz7a4g1hnc8p";
+ sha256 = "02435zvpyr95fljx3xgqz0b0npim1j0611p4rc1azwgdf8hjn11p";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 7392d67ccb6b..a37377835f5f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
- version = "1.6.1";
- sha256Hash = "1gy5al5m1hks0z98cya9kkfinh6k1i8a1d97cy7x6gj0jgmgs88k";
+ version = "1.6.3";
+ sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "429149";
archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli";
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index cffe74a0e806..24529d83e04c 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python36Packages }:
+{ stdenv, fetchpatch, python36Packages }:
with stdenv.lib;
@@ -19,6 +19,13 @@ buildPythonPackage rec {
checkInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
+ sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
+ })
+ ];
+
checkPhase = ''
TMP_TURSES=`echo turses-$RANDOM`
mkdir $TMP_TURSES
@@ -26,7 +33,7 @@ buildPythonPackage rec {
rm -rf $TMP_TURSES
'';
- patchPhase = ''
+ postPatch = ''
sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py
sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py
sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py
@@ -35,7 +42,7 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/alejandrogomez/turses;
+ homepage = https://github.com/louipc/turses;
description = "A Twitter client for the console";
license = licenses.gpl3;
maintainers = with maintainers; [ garbas ];
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 8e1777b0ce79..715d8e13ec30 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -4,11 +4,11 @@
, libpulseaudio, libopus, libogg }:
stdenv.mkDerivation rec {
- name = "gnunet-0.10.1";
+ name = "gnunet-0.11.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
- sha256 = "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n";
+ sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp";
};
buildInputs = [
diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix
new file mode 100644
index 000000000000..e79ca515b518
--- /dev/null
+++ b/pkgs/applications/networking/protonvpn-cli/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils
+, openvpn, python, dialog, wget, update-resolv-conf }:
+
+let
+ expectedUpdateResolvPath = "/etc/openvpn/update-resolv-conf";
+ actualUpdateResolvePath = "${update-resolv-conf}/libexec/openvpn/update-resolv-conf";
+
+in stdenv.mkDerivation rec {
+ name = "protonvpn-cli";
+ version = "1.1.2";
+
+ src = fetchFromGitHub {
+ owner = "ProtonVPN";
+ repo = "protonvpn-cli";
+ rev = "v${version}";
+ sha256 = "0xvflr8zf267n3dv63nkk4wjxhbckw56sqmyca3krf410vrd7zlv";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ substituteInPlace protonvpn-cli.sh \
+ --replace ${expectedUpdateResolvPath} ${actualUpdateResolvePath} \
+ --replace \$UID 0 \
+ --replace /etc/resolv.conf /dev/null \
+ --replace \
+ " echo \"Connecting...\"" \
+ " sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\""
+ cp protonvpn-cli.sh "$out/bin/protonvpn-cli"
+ ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn"
+ '';
+
+ postInstallPhase = ''
+ wrapProgram $out/protonvpn-cli \
+ --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "ProtonVPN Command-Line Tool";
+ homepage = https://github.com/ProtonVPN/protonvpn-cli;
+ maintainers = with maintainers; [ caugner ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 8d0022e3c8b3..d6e25ae4e7b5 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -38,51 +38,30 @@ let
};
});
- versionInfo = {
- "13.8.0" = {
- major = "13";
- minor = "8";
- patch = "0";
- x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
- x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
- x64suffix = "10299729";
- x86suffix = "10299729";
- homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html;
+ versionInfo = let
+ supportedVersions = {
+ "13.10.0" = {
+ major = "13";
+ minor = "10";
+ patch = "0";
+ x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
+ x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
+ x64suffix = "20";
+ x86suffix = "20";
+ homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
+ };
};
- "13.9.0" = {
- major = "13";
- minor = "9";
- patch = "0";
- x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9";
- x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
- x64suffix = "102";
- x86suffix = "102";
- homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh*
- };
-
- "13.9.1" = {
- major = "13";
- minor = "9";
- patch = "1";
- x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC";
- x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483";
- x64suffix = "6";
- x86suffix = "6";
- homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html;
- };
-
- "13.10.0" = {
- major = "13";
- minor = "10";
- patch = "0";
- x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
- x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
- x64suffix = "20";
- x86suffix = "20";
- homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
- };
- };
+ # break an evaluation for old Citrix versions rather than exiting with
+ # an "attribute name not found" error to avoid confusion.
+ deprecatedVersions = let
+ versions = [ "13.8.0" "13.9.0" "13.9.1" ];
+ in
+ lib.listToAttrs
+ (lib.flip map versions
+ (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}")));
+ in
+ deprecatedVersions // supportedVersions;
citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index fdb4206d340f..d96a810ee05a 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -4,31 +4,21 @@
}:
let
- arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
- else if stdenv.hostPlatform.system == "i686-linux" then "x86"
- else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!";
-
- interpreter = if stdenv.hostPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
- else if stdenv.hostPlatform.system == "i686-linux" then "ld-linux.so.2"
- else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!";
-
- sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533"
- else if stdenv.hostPlatform.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16"
- else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!";
+ sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5";
ldpath = stdenv.lib.makeLibraryPath [
fontconfig freetype glib libICE libSM
libX11 libXext libXrender zlib
];
- version = "7.1.0";
+ version = "7.5.0";
in stdenv.mkDerivation {
name = "spideroak-${version}";
src = fetchurl {
- name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz";
- url = "https://spideroak.com/release/spideroak/slack_tar_${arch}";
+ name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
+ url = "https://spideroak.com/release/spideroak/slack_tar_x64";
inherit sha256;
};
@@ -46,7 +36,7 @@ in stdenv.mkDerivation {
rm -f $out/opt/SpiderOakONE/lib/libz*
- patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
+ patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \
"$out/opt/SpiderOakONE/lib/SpiderOakONE"
RPATH=$out/opt/SpiderOakONE/lib:${ldpath}
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index be31f5fd102f..6bb84c523362 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atlassian-cli-${version}";
- version = "7.8.0";
+ version = "8.0.0";
src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
- sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
+ sha256 = "0ysyam06ll70d0baa3hb7wcgqnqflssr64bqjr3db6fnk1q096m8";
extraPostFetch = "chmod go-w $out";
};
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index e4b89ef36100..31e74ccf23a1 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
-, gnome3, libappindicator-gtk3, libnotify }:
+, gtksourceview3, libappindicator-gtk3, libnotify }:
python3Packages.buildPythonApplication rec {
name = "autokey-${version}";
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
# Note: no dependencies included for Qt GUI because Qt ui is poorly
# maintained—see https://github.com/autokey/autokey/issues/51
- buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview
+ buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3
libappindicator-gtk3 libnotify ];
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index f5fc705eed4c..9c14ffdbbfdd 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,7 +3,7 @@
rec {
major = "6";
minor = "2";
- patch = "1";
+ patch = "2";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "0p2r48n27v5ifbj3cb9bs38nb6699awmdqx4shy1c6p28b24y78f";
+ sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 9113eedc06cd..a7f24fdf1f38 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome3, glib, ncurses, epoxy, gpgme
-, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
+, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
}:
@@ -48,14 +48,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "180d4rrzb3lq7g2w7x512fn8chfkjg4ld20ikrj6hkg11kj4hbmy";
+ sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "06fgd5jkqqbvskyj1ywmsmb4crsj064s8r45nrv0r8j6ydn0hi1l";
+ sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1";
};
};
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index e9eeacf63b52..fda975a9031a 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -56,11 +56,11 @@
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
- name = "cairo-1.15.12.tar.xz";
- url = "http://dev-www.libreoffice.org/src/cairo-1.15.12.tar.xz";
- sha256 = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9";
+ name = "cairo-1.16.0.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz";
+ sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331";
md5 = "";
- md5name = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9-cairo-1.15.12.tar.xz";
+ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz";
}
{
name = "libcdr-0.1.5.tar.xz";
@@ -658,11 +658,11 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
- name = "openssl-1.0.2p.tar.gz";
- url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz";
- sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00";
+ name = "openssl-1.0.2r.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz";
+ sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6";
md5 = "";
- md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz";
+ md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz";
}
{
name = "liborcus-0.14.1.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 1da6160e85bb..1b7d2b0987f8 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome3, glib, ncurses, epoxy, gpgme
-, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
+, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
}:
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
index cff8f200e2bc..62569734745c 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -5,7 +5,13 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}"
if uname | grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
- mkdir "$dbus_tmp_dir"
+ if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
+ mkdir -p "$dbus_tmp_dir"
+ fi
+ if ! test -d "$dbus_tmp_dir"; then
+ dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus"
+ mkdir -p "$dbus_tmp_dir"
+ fi
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null &
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix
index 2dee39a0ad3b..08b6d66a344c 100644
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "notes-up";
- version = "1.6.3";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Notes-up";
rev = version;
- sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q";
+ sha256 = "16bb9ffsg2csps1cb636rff5vc6f1yyhg65g3y5b4wf2hlbmzgql";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index f28c49ce4dd7..7c72c03edca1 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qownnotes";
- version = "19.3.0";
+ version = "19.3.4";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
- sha256 = "09265d9xgqmdw3fbf94fj2irgq2dp2jhkfd2kq33axfzgpm85bdz";
+ sha256 = "4e2d25acf596ed3a759b298e39f6f8bea001c0625e143616bf97560913d7f86f";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index dc9f0b89b2ff..090152961ca3 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -13,11 +13,11 @@ let
in stdenv.mkDerivation rec {
name = "trilium-${version}";
- version = "0.30.4";
+ version = "0.30.6";
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "1541z56rk329sj7a20llhhmv2f552amj1n3cisvqga4gn2yq3hnm";
+ sha256 = "0f2hf2lky4r4nh3hj5fmniy8gjbgdyj8i5d6bhf156yp3lx802ay";
};
# Fetch from source repo, no longer included in release.
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index eb7ba2a8c9c4..fb7963416167 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
name = "stellarium-${version}";
- version = "0.18.3";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "1cnwfk3vdsxh8gacw22qik401z0kpzd1ralbg9ph2cjqx9x2m1s1";
+ sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index e97b5d1a3f4f..516608466a93 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "bowtie2";
- version = "2.3.4.3";
+ version = "2.3.5";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BenLangmead";
repo = pname;
rev = "v${version}";
- sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp";
+ sha256 = "12v240wnbc541hl4z2fiymxd3bd6czazs13fjkygldflg48w45m0";
};
buildInputs = [ zlib tbb python perl ];
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix
new file mode 100644
index 000000000000..804e71c1bfa7
--- /dev/null
+++ b/pkgs/applications/science/biology/itsx/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, hmmer, perl }:
+
+stdenv.mkDerivation rec {
+ version = "1.1.1";
+ name = "itsx-${version}";
+
+ src = fetchurl {
+ url = "http://microbiology.se/sw/ITSx_${version}.tar.gz";
+ sha256 = "0lrmy2n3ax7f208k0k8l3yz0j5cpz05hv4hx1nnxzn0c51z1pc31";
+ };
+
+ buildInputs = [ hmmer perl ];
+
+ buildPhase = ''
+ sed -e "s,profileDB = .*,profileDB = \"$out/share/ITSx_db/HMMs\";," -i ITSx
+ sed "3 a \$ENV{\'PATH\'}='${hmmer}/bin:'.\"\$ENV{\'PATH\'}\";" -i ITSx
+ mkdir bin
+ mv ITSx bin
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/doc && cp -a bin $out/
+ cp *pdf $out/share/doc
+ cp -r ITSx_db $out/share
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing";
+ homepage = http://microbiology.se/software/itsx/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.bzizou ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix
new file mode 100644
index 000000000000..56bb35b64df8
--- /dev/null
+++ b/pkgs/applications/science/biology/megahit/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "megahit";
+ version = "1.1.4";
+
+ src = fetchFromGitHub {
+ owner = "voutcn";
+ repo = "megahit";
+ rev = "v${version}";
+ sha256 = "011k0776w76l03zmy70kfd3y9zjmdnspfbs9fcxmnl3bdwd36kcw";
+ };
+
+ buildInputs = [ zlib ];
+
+ installPhase = ''
+ for bin in megahit_sdbg_build megahit megahit_asm_core megahit_toolkit; do
+ install -vD $bin $out/bin/$bin
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";
+ license = licenses.gpl3;
+ homepage = https://github.com/voutcn/megahit;
+ maintainers = with maintainers; [ luispedro ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix
new file mode 100644
index 000000000000..dbbf8d39a93c
--- /dev/null
+++ b/pkgs/applications/science/biology/messer-slim/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, gcc, gcc-unwrapped }:
+
+stdenv.mkDerivation rec {
+ version = "3.2.1";
+ name = "messer-slim-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz";
+ sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
+
+ cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
+ "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ];
+
+ meta = {
+ description = "An evolutionary simulation framework";
+ homepage = https://messerlab.org/slim/;
+ license = with stdenv.lib.licenses; [ gpl3 ];
+ maintainers = with stdenv.lib.maintainers; [ bzizou ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 3f28b5e31ccd..85c2b99b3a78 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "minimap2";
- version = "2.15";
+ version = "2.16";
src = fetchFromGitHub {
repo = pname;
owner = "lh3";
rev = "v${version}";
- sha256 = "0dy3m2wjmi3whjnmkj3maa1aadz525h7736wm8vvdcwq71ijqb7v";
+ sha256 = "1ggm5psv3gwsz627ik9kl6ry9gzgmfsvya6ni0gv6ahwlrhdim73";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index fe25a04c420a..68efc2030e53 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "4.9h";
+ version = "4.9i";
name = "paml-${version}";
src = fetchurl {
url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
- sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2";
+ sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
};
preBuild = ''
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 7f5eb7b76e8c..c55766b8d615 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.29.31";
+ version = "14.29.32";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "15mxifm1h145bhyrm9rvmipvg048q8rgwg1sn6jmfgrimy0cjraj";
+ sha256 = "0jpl8smljyjpd3x1q6fcamgia1ij7gxk51faw99ys8ydnrzd57di";
};
patchPhase = ''
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 99a8c777cd0e..35d21848e2b3 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec {
- version = "5.9.3";
+ version = "5.9.5";
name = "molden-${version}";
src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
- sha256 = "18fz44g7zkm0xcx3w9hm049jv13af67ww7mb5b3kdhmza333a16q";
+ sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9";
};
nativeBuildInputs = [ which ];
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 2dd3c9b64c43..5fc71c9fc6ba 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "8.3";
+ version = "8.4";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
- sha256 = "0nr3qmyfhp6fy8qrp4p43pl5xxfqgqg5g1c2775hxhpsi29xr7zf";
+ sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
};
nativeBuildInputs = [ perl procps fftw.dev ];
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 18a5281bebb0..4b9f15e0a92f 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
stdenv.mkDerivation rec {
- name = "ginac-1.7.4";
+ name = "ginac-1.7.5";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "1vvqv73yk9klbq0mz239zzw77rlp72qcvzci4j1v6rafvji1616n";
+ sha256 = "11v8dpdfq8ybbbadyakp19xc7jgckplbbj6q2hh1c2hj5ps6njz7";
};
propagatedBuildInputs = [ cln ];
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index e3760533edae..8f96eb8f3060 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
-let version = "4.2.1"; in
+let version = "4.2.2"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "1f11481e68900dc256f88aaed18d03e93b416ba01e9e8c3dc3f6d59a211f0561";
+ sha256 = "e9ee9f5c606bbec5f2adbb8c3d6023c4e2577f487fa4e4ecfcfc94a241cc8dcc";
};
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 5104d1012b2f..61ebed896875 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "qalculate-gtk-${version}";
- version = "2.9.0";
+ pname = "qalculate-gtk";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "0c5s7mz8xwwmzc22yai8vqiww7paafkyi7khp8a2yws78m2nirdx";
+ sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index dd51059ff01b..75cd308da400 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -137,6 +137,13 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/27405
./patches/ignore-pip-deprecation.patch
+
+ # https://trac.sagemath.org/ticket/27360
+ (fetchpatch {
+ name = "eclib-20190226.patch";
+ url = "https://git.sagemath.org/sage.git/patch/?id=f570e3a7fc2965764b84c04ce301a88ded2c42df";
+ sha256 = "0l5c4giixkn15v2a06sfzq5mkxila6l67zkjbacirwprrlpcnmmp";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 1f0fc663647a..871f5ece9cfe 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
+{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1
, Cocoa, OpenGL, cf-private, noSplash ? false }:
@@ -19,11 +19,30 @@ stdenv.mkDerivation rec {
patches = [
./sw_vers_root5.patch
+
+ (fetchpatch {
+ name = "enable_new_gcc.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/enable_new_gcc.patch?h=root5&id=91c50876081a0af36f84ec4f0f9dba869107fa4f";
+ sha256 = "1rnp0xlw0yqi7mjs4w145njd79i8kkir1qik7zwicdik9axf8ygm";
+ })
+
+ # prevents rootcint from looking in /usr/includes and such
+ ./purify_include_paths_root5.patch
+
+ # disable dictionary generation for stuff that includes libc headers
+ # our glibc requires a modern compiler
+ ./disable_libc_dicts_root5.patch
];
preConfigure = ''
patchShebangs build/unix/
ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/
+ ''
+ # Fix CINTSYSDIR for "build" version of rootcint
+ # This is probably a bug that breaks out-of-source builds
+ + ''
+ substituteInPlace cint/cint/src/loadfile.cxx\
+ --replace 'env = "cint";' 'env = "'`pwd`'/cint";'
'' + stdenv.lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
'';
@@ -73,8 +92,5 @@ stdenv.mkDerivation rec {
description = "A data analysis framework";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
- # needs to be adapted to work with modern glibc
- # it works on darwin by impurely picking up system's libc headers
- broken = stdenv.isLinux;
};
}
diff --git a/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch b/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
new file mode 100644
index 000000000000..abd6222847ef
--- /dev/null
+++ b/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
@@ -0,0 +1,27 @@
+diff --git a/cint/ROOT/CMakeLists.txt b/cint/ROOT/CMakeLists.txt
+--- a/cint/ROOT/CMakeLists.txt
++++ b/cint/ROOT/CMakeLists.txt
+@@ -47,21 +47,13 @@ set(CINTSTLDLLHEADERS
+ ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h
+ )
+ set(CINTINCDLLNAMES
+- stdfunc
++# stdfunc
+ # stdcxxfunc
+ )
+ set(CINTINCDLLHEADERS
+- ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h
++# ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h
+ # ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h
+ )
+-if(NOT WIN32)
+- set(CINTSTLDLLNAMES ${CINTSTLDLLNAMES} valarray)
+- set(CINTSTLDLLHEADERS ${CINTSTLDLLHEADERS} ${CINTDLLDIR}/vary.h)
+- set(CINTINCDLLNAMES ${CINTINCDLLNAMES} posix ipc)
+- set(CINTINCDLLHEADERS ${CINTINCDLLHEADERS}
+- ${CMAKE_SOURCE_DIR}/cint/cint/lib/posix/exten.h
+- ${CMAKE_SOURCE_DIR}/cint/cint/lib/ipc/ipcif.h)
+-endif()
+
+ set(CINTBUILDLOADER
+ vector
diff --git a/pkgs/applications/science/misc/root/purify_include_paths_root5.patch b/pkgs/applications/science/misc/root/purify_include_paths_root5.patch
new file mode 100644
index 000000000000..6773603b8ad3
--- /dev/null
+++ b/pkgs/applications/science/misc/root/purify_include_paths_root5.patch
@@ -0,0 +1,204 @@
+diff --git a/cint/cint/src/loadfile.cxx b/cint/cint/src/loadfile.cxx
+--- a/cint/cint/src/loadfile.cxx
++++ b/cint/cint/src/loadfile.cxx
+@@ -1365,92 +1365,6 @@ int G__statfilename(const char *filenamein, struct stat *statBuf,
+ }
+ }
+ #endif /* G__EDU_VERSION */
+-
+-#ifdef G__VISUAL
+- /**********************************************
+- * try /msdev/include
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/msdev/include/%s%s",filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif /* G__VISUAL */
+-
+-#ifdef G__SYMANTEC
+- /**********************************************
+- * try /sc/include
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/sc/include/%s%s",filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif // G__SYMANTEC
+-
+-#ifndef G__WIN32
+- /**********************************************
+- * try /usr/include/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/usr/include/%s%s",filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif
+-
+-#ifdef __GNUC__
+- /**********************************************
+- * try /usr/include/g++/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/usr/include/g++/%s%s",filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif /* __GNUC__ */
+-
+-#ifndef G__WIN32
+- /* #ifdef __hpux */
+- /**********************************************
+- * try /usr/include/CC/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/usr/include/CC/%s%s",filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif
+-
+-#ifndef G__WIN32
+- /**********************************************
+- * try /usr/include/codelibs/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- workname.Format("/usr/include/codelibs/%s%s"
+- ,filename(),addpost[i2]);
+- res = stat( workname, statBuf );
+- if (res==0) {
+- if (fullPath) fullPath->Swap(workname);
+- return res;
+- }
+- }
+-#endif
+ }
+ return -1;
+ }
+@@ -1960,107 +1874,6 @@ int G__loadfile(const char *filenamein)
+ }
+ if(G__ifile.fp) break;
+ #endif /* G__EDU_VERSION */
+-
+-#ifdef G__VISUAL
+- /**********************************************
+- * try /msdev/include
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/msdev/include/%s%s",filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-#endif /* G__VISUAL */
+-
+-#ifdef G__SYMANTEC
+- /**********************************************
+- * try /sc/include
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/sc/include/%s%s",filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-#endif /* G__SYMANTEC */
+-
+-#ifndef G__WIN32
+- /**********************************************
+- * try /usr/include/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/%s%s",filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-#endif
+-
+-#ifdef __GNUC__
+- /**********************************************
+- * try /usr/include/g++/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/g++/%s%s",filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-#endif /* __GNUC__ */
+-
+-#ifndef G__WIN32
+-/* #ifdef __hpux */
+- /**********************************************
+- * try /usr/include/CC/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/CC/%s%s",filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-/* #endif __hpux */
+-#endif
+-
+-#ifndef G__WIN32
+-/* #ifdef __hpux */
+- /**********************************************
+- * try /usr/include/codelibs/filename
+- **********************************************/
+- if('\0'!=G__cintsysdir[0]) {
+- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/codelibs/%s%s"
+- ,filename(),addpost[i2]);
+-#ifndef G__WIN32
+- G__ifile.fp = fopen(G__ifile.name,"r");
+-#else
+- G__ifile.fp = fopen(G__ifile.name,"rb");
+-#endif
+- G__globalcomp=G__store_globalcomp;
+- }
+- if(G__ifile.fp) break;
+-/* #endif __hpux */
+-#endif
+ }
+ }
+
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index a682d59ab23a..f0ac310ea665 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation {
- name = "gromacs-2019";
+ name = "gromacs-2019.1";
src = fetchurl {
- url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz";
- sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5";
+ url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.1.tar.gz";
+ sha256 = "1v438nf6viwpl53ydrljf598cf8lh7jqxp5bzi74rrnhzk97xhxj";
};
buildInputs = [cmake fftw]
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index c2afda2d53d9..a0917d03ce11 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
- findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
+ findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme,
wrapGAppsHook
}:
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
];
buildInputs = [
- gnome3.gtk
+ gtk3
gnome3.dconf
pythonPackages.pyxdg
pythonPackages.ptyprocess
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index 5e1a0cab69d9..d7d0c28dcc12 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -7,7 +7,7 @@ with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
- version = "1.45";
+ version = "1.47";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
@@ -16,8 +16,8 @@ mkDerivation rec {
};
src = fetchurl {
- url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.45.tar.gz";
- sha256 = "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z";
+ url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.47.tar.gz";
+ sha256 = "08kll7jlak26asvnqgwbkci3d6irvy96ijjl7fmck6h7i5mx5lz7";
};
buildInputs = [
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 9f18beda7f93..e6e136e290d8 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 {
pname = "hub";
- version = "2.10.0";
+ version = "2.11.1";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27";
+ sha256 = "1gq3m4w4j63n3i43pyq2niwacd8cjypaj27yjabb582x63a431xy";
};
nativeBuildInputs = [ groff utillinux ];
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 0074d44391ef..06c8bb8cb2dd 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.gpl2;
- homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
+ homepage = https://github.com/tibirna/qgit;
description = "Graphical front-end to Git";
maintainers = with maintainers; [ peterhoeg markuskowa ];
inherit (qtbase.meta) platforms;
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 6f72b2e1775c..38aa63c1ab07 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,14 +7,14 @@
with stdenv.lib;
buildGoPackage rec {
- name = "gitea-${version}";
- version = "1.7.3";
+ pname = "gitea";
+ version = "1.7.5";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "0q33xn2l2ii8vd3hxr0f6ipk8mv2ahb3p8fzdzylhgg9w15snvsr";
+ sha256 = "063rfb0jwxfq91cw7gp0achqsgi3dpj1pqfi7k5md67bhp2i2si3";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -35,12 +35,15 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ]
++ optional pamSupport pam;
- buildFlags = optional sqliteSupport "-tags sqlite"
- ++ optional pamSupport "-tags pam";
- buildFlagsArray = ''
- -ldflags=
- -X=main.Version=${version}
- ${optionalString sqliteSupport "-X=main.Tags=sqlite"}
+ preBuild = let
+ tags = optional pamSupport "pam"
+ ++ optional sqliteSupport "sqlite";
+ tagsString = concatStringsSep " " tags;
+ in ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
+ )
'';
outputs = [ "bin" "out" "data" ];
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 3298bc167517..e15709191bfd 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
{
"ce": {
- "version": "11.7.5",
- "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn",
- "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb",
+ "version": "11.9.1",
+ "repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l",
+ "deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
- "rev": "v11.7.5",
+ "rev": "v11.9.1",
"passthru": {
- "GITALY_SERVER_VERSION": "1.12.2",
- "GITLAB_PAGES_VERSION": "1.3.1",
- "GITLAB_SHELL_VERSION": "8.4.4",
- "GITLAB_WORKHORSE_VERSION": "8.0.2"
+ "GITALY_SERVER_VERSION": "1.27.1",
+ "GITLAB_PAGES_VERSION": "1.5.0",
+ "GITLAB_SHELL_VERSION": "8.7.1",
+ "GITLAB_WORKHORSE_VERSION": "8.3.1"
}
},
"ee": {
- "version": "11.7.5",
- "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm",
- "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb",
+ "version": "11.9.1",
+ "repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd",
+ "deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
- "rev": "v11.7.5-ee",
+ "rev": "v11.9.1-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.12.2",
- "GITLAB_PAGES_VERSION": "1.3.1",
- "GITLAB_SHELL_VERSION": "8.4.4",
- "GITLAB_WORKHORSE_VERSION": "8.0.2"
+ "GITALY_SERVER_VERSION": "1.27.1",
+ "GITLAB_PAGES_VERSION": "1.5.0",
+ "GITLAB_SHELL_VERSION": "8.7.1",
+ "GITLAB_WORKHORSE_VERSION": "8.3.1"
}
}
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 81f1864099f3..8a8ce5771cf4 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -3,10 +3,10 @@ source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
gem 'bundler', '>= 1.16.5'
-gem 'rugged', '~> 0.27'
+gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitaly-proto', '~> 1.3.0'
+gem 'gitaly-proto', '~> 1.13.0'
gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
gem 'gitlab-gollum-lib', '~> 4.2', require: false
@@ -14,6 +14,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
gem 'grpc', '~> 1.15.0'
gem 'sentry-raven', '~> 2.7.2', require: false
gem 'faraday', '~> 0.12'
+gem 'rbtrace', require: false
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -27,4 +28,11 @@ group :development, :test do
gem 'rspec-parameterized', require: false
gem 'timecop', require: false
gem 'factory_bot', require: false
+ gem 'pry', '~> 0.12.2', require: false
+
+ # gitlab-shell spec gems
+ gem 'listen', '~> 0.5.0'
+ gem 'simplecov', '~> 0.9.0', require: false
+ gem 'vcr', '~> 4.0.0'
+ gem 'webmock', '~> 3.4.0'
end
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 59f8ad69f223..4deb64c4cd5b 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -10,6 +10,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
@@ -19,18 +21,22 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.3)
+ crack (0.4.3)
+ safe_yaml (~> 1.0.0)
crass (1.0.4)
debug_inspector (0.0.3)
diff-lcs (1.3)
+ docile (1.1.5)
equalizer (0.0.11)
escape_utils (1.2.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
+ ffi (1.10.0)
gemojione (3.3.0)
json
- gitaly-proto (1.3.0)
+ gitaly-proto (1.13.0)
grpc (~> 1.0)
github-linguist (6.2.0)
charlock_holmes (~> 0.7.6)
@@ -58,29 +64,35 @@ GEM
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
grpc (1.15.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
+ hashdiff (0.3.8)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.1.0)
licensee (8.9.2)
rugged (~> 0.24)
+ listen (0.5.3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
+ method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
+ msgpack (1.2.6)
+ multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.1)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
+ optimist (3.0.0)
parallel (1.12.1)
parser (2.5.3.0)
ast (~> 2.4.0)
@@ -91,7 +103,15 @@ GEM
parser
unparser
procto (0.0.3)
+ pry (0.12.2)
+ coderay (~> 1.1.0)
+ method_source (~> 0.9.0)
+ public_suffix (3.0.3)
rainbow (3.0.0)
+ rbtrace (0.4.11)
+ ffi (>= 1.0.6)
+ msgpack (>= 0.4.3)
+ optimist (>= 3.0.0)
rdoc (4.3.0)
rouge (3.3.0)
rspec (3.7.0)
@@ -121,13 +141,19 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
- rugged (0.27.5)
+ rugged (0.28.0)
+ safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
- sentry-raven (2.7.2)
+ sentry-raven (2.7.4)
faraday (>= 0.7.6, < 1.0)
+ simplecov (0.9.2)
+ docile (~> 1.1.0)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.9.0)
+ simplecov-html (0.9.0)
stringex (2.8.4)
thread_safe (0.3.6)
timecop (0.9.1)
@@ -142,6 +168,11 @@ GEM
equalizer (~> 0.0.9)
parser (>= 2.3.1.2, < 2.6)
procto (~> 0.0.2)
+ vcr (4.0.0)
+ webmock (3.4.2)
+ addressable (>= 2.3.6)
+ crack (>= 0.3.2)
+ hashdiff
PLATFORMS
ruby
@@ -151,7 +182,7 @@ DEPENDENCIES
bundler (>= 1.16.5)
factory_bot
faraday (~> 0.12)
- gitaly-proto (~> 1.3.0)
+ gitaly-proto (~> 1.13.0)
github-linguist (~> 6.1)
gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
@@ -159,13 +190,19 @@ DEPENDENCIES
google-protobuf (~> 3.6)
grpc (~> 1.15.0)
licensee (~> 8.9.0)
+ listen (~> 0.5.0)
+ pry (~> 0.12.2)
+ rbtrace
rdoc (~> 4.2)
rspec
rspec-parameterized
rubocop (~> 0.50)
- rugged (~> 0.27)
+ rugged (~> 0.28)
sentry-raven (~> 2.7.2)
+ simplecov (~> 0.9.0)
timecop
+ vcr (~> 4.0.0)
+ webmock (~> 3.4.0)
BUNDLED WITH
- 1.17.1
+ 1.17.3
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 349b75f19347..d476e7c9038f 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "1.12.2";
+ version = "1.27.1";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy";
+ sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -27,7 +27,14 @@ in buildGoPackage rec {
postInstall = ''
mkdir -p $ruby
- cp -rv $src/ruby/{bin,lib} $ruby
+ cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby
+
+ # gitlab-shell will try to read its config relative to the source
+ # code by default which doesn't work in nixos because it's a
+ # read-only filesystem
+ substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \
+ "File.join(ROOT_PATH, 'config.yml')" \
+ "'/run/gitlab/shell-config.yml'"
'';
outputs = [ "bin" "out" "ruby" ];
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index c06be7891ffb..61abc97ed548 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -25,6 +25,15 @@
};
version = "0.2.0";
};
+ addressable = {
+ dependencies = ["public_suffix"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ type = "gem";
+ };
+ version = "2.5.2";
+ };
ast = {
source = {
remotes = ["https://rubygems.org"];
@@ -75,6 +84,15 @@
};
version = "1.1.3";
};
+ crack = {
+ dependencies = ["safe_yaml"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+ type = "gem";
+ };
+ version = "0.4.3";
+ };
crass = {
source = {
remotes = ["https://rubygems.org"];
@@ -99,6 +117,14 @@
};
version = "1.3";
};
+ docile = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
equalizer = {
source = {
remotes = ["https://rubygems.org"];
@@ -133,6 +159,14 @@
};
version = "0.15.3";
};
+ ffi = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
gemojione = {
dependencies = ["json"];
source = {
@@ -146,10 +180,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680";
+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
- version = "1.3.0";
+ version = "1.13.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -224,10 +258,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -238,6 +272,14 @@
};
version = "1.15.0";
};
+ hashdiff = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
+ type = "gem";
+ };
+ version = "0.3.8";
+ };
i18n = {
dependencies = ["concurrent-ruby"];
source = {
@@ -272,6 +314,14 @@
};
version = "8.9.2";
};
+ listen = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
+ type = "gem";
+ };
+ version = "0.5.3";
+ };
memoizable = {
dependencies = ["thread_safe"];
source = {
@@ -281,6 +331,14 @@
};
version = "0.4.2";
};
+ method_source = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+ type = "gem";
+ };
+ version = "0.9.2";
+ };
mime-types = {
dependencies = ["mime-types-data"];
source = {
@@ -301,10 +359,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -314,6 +372,22 @@
};
version = "5.11.3";
};
+ msgpack = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
+ type = "gem";
+ };
+ version = "1.2.6";
+ };
+ multi_json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ type = "gem";
+ };
+ version = "1.13.1";
+ };
multipart-post = {
source = {
remotes = ["https://rubygems.org"];
@@ -326,10 +400,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.1";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -340,6 +414,14 @@
};
version = "1.5.0";
};
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
parallel = {
source = {
remotes = ["https://rubygems.org"];
@@ -390,6 +472,23 @@
};
version = "0.0.3";
};
+ pry = {
+ dependencies = ["coderay" "method_source"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+ type = "gem";
+ };
+ version = "0.12.2";
+ };
+ public_suffix = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ type = "gem";
+ };
+ version = "3.0.3";
+ };
rainbow = {
source = {
remotes = ["https://rubygems.org"];
@@ -398,6 +497,15 @@
};
version = "3.0.0";
};
+ rbtrace = {
+ dependencies = ["ffi" "msgpack" "optimist"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
+ type = "gem";
+ };
+ version = "0.4.11";
+ };
rdoc = {
source = {
remotes = ["https://rubygems.org"];
@@ -487,10 +595,18 @@
rugged = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.0";
+ };
+ safe_yaml = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+ type = "gem";
+ };
+ version = "1.0.4";
};
sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"];
@@ -505,10 +621,27 @@
dependencies = ["faraday"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
+ sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
type = "gem";
};
- version = "2.7.2";
+ version = "2.7.4";
+ };
+ simplecov = {
+ dependencies = ["docile" "multi_json" "simplecov-html"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
+ type = "gem";
+ };
+ version = "0.9.2";
+ };
+ simplecov-html = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
+ type = "gem";
+ };
+ version = "0.9.0";
};
stringex = {
source = {
@@ -560,4 +693,21 @@
};
version = "0.2.8";
};
+ vcr = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ webmock = {
+ dependencies = ["addressable" "crack" "hashdiff"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
+ type = "gem";
+ };
+ version = "3.4.2";
+ };
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index bb48a441253f..c3199142da3f 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "8.4.4";
+ version = "8.7.1";
name = "gitlab-shell-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq";
+ sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia";
};
buildInputs = [ ruby bundler go ];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 7819c863a359..9b5efeaee801 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,16 +1,16 @@
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
-index 435cb29..078c1df 100644
+index f951fe6..b422fe3 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
-@@ -2,7 +2,6 @@ package config
-
+@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
+ "net/url"
- "os"
"path"
+ "strings"
- yaml "gopkg.in/yaml.v2"
-@@ -26,16 +25,13 @@ type Config struct {
+@@ -30,16 +29,13 @@ type Config struct {
}
func New() (*Config, error) {
@@ -28,12 +28,25 @@ index 435cb29..078c1df 100644
+ return newFromFile("/run/gitlab/shell-config.yml")
}
- func newFromFile(filename string) (*Config, error) {
+ func (c *Config) FeatureEnabled(featureName string) bool {
+diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
+index 0600a18..c46f2d7 100644
+--- a/lib/gitlab_keys.rb
++++ b/lib/gitlab_keys.rb
+@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
+ attr_accessor :auth_file, :key
+
+ def self.command(whatever)
+- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
++ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
+ end
+
+ def self.command_key(key_id)
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index 57c70f5..700569b 100644
+index 2cb76a8..f59ad5e 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
-@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
+@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
args = [executable, gitaly_address, json_args]
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
@@ -43,16 +56,3 @@ index 57c70f5..700569b 100644
end
def api
-diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
-index 0600a18..6814f0a 100644
---- a/lib/gitlab_keys.rb
-+++ b/lib/gitlab_keys.rb
-@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
- attr_accessor :auth_file, :key
-
- def self.command(whatever)
-- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
-+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
- end
-
- def self.command_key(key_id)
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index c49bbe9ccef7..6540ee0be963 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}";
- version = "8.0.2";
+ version = "8.3.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690";
+ sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index f59e61208ac3..f36e2e38d6be 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
-gem 'rugged', '~> 0.27'
+gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0'
gem 'faraday', '~> 0.12'
@@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
-gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.7.1'
-gem 'fog-local', '~> 0.3'
-gem 'fog-openstack', '~> 0.1'
+gem 'fog-aws', '~> 3.3'
+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
+# Also see config/initializers/fog_core_patch.rb.
+gem 'fog-core', '= 2.1.0'
+gem 'fog-google', '~> 1.8'
+gem 'fog-local', '~> 0.6'
+gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.2.0'
+gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@@ -113,10 +115,9 @@ gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
+gem 'deckar01-task_list', '2.2.0'
gem 'gitlab-markup', '~> 1.6.5'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
@@ -126,9 +127,9 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
-gem 'truncato', '~> 0.7.9'
+gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.5'
+gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -144,7 +145,7 @@ gem 'diffy', '~> 3.1.0'
gem 'rack', '2.0.6'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -161,12 +162,12 @@ gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
gem 'sidekiq', '~> 5.2.1'
-gem 'sidekiq-cron', '~> 0.6.0'
+gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'rufus-scheduler', '~> 3.4'
+gem 'fugit', '~> 1.1'
# HTTP requests
gem 'httparty', '~> 0.13.3'
@@ -185,10 +186,10 @@ gem 're2', '~> 1.1.1'
# Misc
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing
gem 'device_detector'
@@ -203,9 +204,6 @@ gem 'connection_pool', '~> 2.0'
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
-# HipChat integration
-gem 'hipchat', '~> 1.5.0'
-
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -225,7 +223,7 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.2.2'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@@ -305,6 +303,12 @@ group :metrics do
gem 'raindrops', '~> 0.18'
end
+group :tracing do
+ # OpenTracing
+ gem 'opentracing', '~> 0.4.3'
+ gem 'jaeger-client', '~> 0.10.0'
+end
+
group :development do
gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
@@ -321,7 +325,7 @@ group :development do
end
group :development, :test do
- gem 'bootsnap', '~> 1.3'
+ gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -378,7 +382,7 @@ group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
+ gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@@ -408,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support
gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -417,7 +421,8 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
+
gem 'grpc', '~> 1.15.0'
gem 'google-protobuf', '~> 3.6'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index 77b4360cf413..1be6f2289544 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
binding_ninja (0.2.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.2)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -113,6 +113,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
+ character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
@@ -143,7 +144,7 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.0.0)
+ deckar01-task_list (2.2.0)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
@@ -185,7 +186,7 @@ GEM
erubi (1.7.1)
erubis (2.7.0)
escape_utils (1.2.1)
- et-orbi (1.0.3)
+ et-orbi (1.1.7)
tzinfo
eventmachine (1.2.7)
excon (0.62.0)
@@ -206,7 +207,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.9.25)
+ ffi (1.10.0)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)
@@ -217,32 +218,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.2.0)
- fog-core (~> 1.27)
- fog-json (~> 1.0)
+ fog-aliyun (0.3.3)
+ fog-core
+ fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (2.0.1)
- fog-core (~> 1.38)
- fog-json (~> 1.0)
+ fog-aws (3.3.0)
+ fog-core (~> 2.1)
+ fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-core (1.45.0)
+ fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
- fog-google (1.7.1)
- fog-core
- fog-json
- fog-xml
+ mime-types
+ fog-google (1.8.2)
+ fog-core (<= 2.1.0)
+ fog-json (~> 1.2)
+ fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
- fog-json (1.0.2)
- fog-core (~> 1.0)
+ fog-json (1.2.0)
+ fog-core
multi_json (~> 1.10)
- fog-local (0.3.1)
- fog-core (~> 1.27)
- fog-openstack (0.1.21)
- fog-core (>= 1.40)
+ fog-local (0.6.0)
+ fog-core (>= 1.27, < 3.0)
+ fog-openstack (1.0.8)
+ fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@@ -258,6 +260,9 @@ GEM
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
+ fugit (1.1.7)
+ et-orbi (~> 1.1, >= 1.1.7)
+ raabro (~> 1.1)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
@@ -274,7 +279,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.5.0)
+ gitaly-proto (1.13.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@@ -282,11 +287,11 @@ GEM
gitlab-markup (1.6.5)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
- gitlab-styles (2.4.1)
+ gitlab-styles (2.5.1)
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
- gitlab_omniauth-ldap (2.0.4)
+ gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -305,7 +310,7 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@@ -353,15 +358,12 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
- hashdiff (0.3.4)
+ hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
- hipchat (1.5.2)
- httparty
- mimemagic
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
@@ -389,13 +391,18 @@ GEM
cause
json
ipaddress (0.8.3)
+ jaeger-client (0.10.0)
+ opentracing (~> 0.3)
+ thrift
jira-ruby (1.4.1)
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
- js_regex (2.2.1)
- regexp_parser (>= 0.4.11, <= 0.5.0)
+ js_regex (3.1.1)
+ character_set (~> 1.1)
+ regexp_parser (~> 1.1)
+ regexp_property_values (~> 0.3)
json (1.8.6)
json-jwt (1.9.4)
activesupport
@@ -416,10 +423,10 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
- kgio (2.10.0)
+ kgio (2.11.2)
knapsack (1.17.0)
rake
- kubeclient (4.0.0)
+ kubeclient (4.2.2)
http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
@@ -462,9 +469,9 @@ GEM
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_mime (1.0.1)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
- msgpack (1.2.4)
+ msgpack (1.2.6)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -477,8 +484,8 @@ GEM
net-ssh (5.0.1)
netrc (0.11.0)
nio4r (2.3.1)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.1)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
numerizer (0.1.1)
@@ -544,6 +551,8 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
+ opentracing (0.4.3)
+ optimist (3.0.0)
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
@@ -575,7 +584,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.3)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -606,6 +615,7 @@ GEM
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
+ raabro (1.1.6)
rack (2.0.6)
rack-accept (0.4.5)
rack (>= 0.4)
@@ -618,7 +628,7 @@ GEM
httpclient (>= 2.4)
multi_json (>= 1.3.6)
rack (>= 1.1)
- rack-protection (2.0.4)
+ rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
rack
@@ -657,23 +667,22 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
- raindrops (0.18.0)
+ raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbtrace (0.4.10)
+ rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
- trollop (>= 1.16.2)
+ optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.0.0)
json
recursive-open-struct (1.1.0)
- redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
@@ -693,7 +702,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.6.0)
redis (>= 2.2, < 5)
- regexp_parser (0.5.0)
+ regexp_parser (1.3.0)
+ regexp_property_values (0.3.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -775,9 +785,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rufus-scheduler (3.4.0)
- et-orbi (~> 1.0)
- rugged (0.27.5)
+ rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -816,12 +824,13 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.2.3)
+ sidekiq (5.2.5)
connection_pool (~> 2.2, >= 2.2.2)
+ rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
- sidekiq-cron (0.6.0)
- rufus-scheduler (>= 3.3.0)
+ sidekiq-cron (1.0.4)
+ fugit (~> 1.1)
sidekiq (>= 4.2.1)
signet (0.11.0)
addressable (~> 2.3)
@@ -847,7 +856,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
- sshkey (1.9.0)
+ sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@@ -868,6 +877,7 @@ GEM
rack (>= 1, < 3)
thor (0.19.4)
thread_safe (0.3.6)
+ thrift (0.11.0.0)
tilt (2.0.8)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
@@ -875,10 +885,9 @@ GEM
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
- trollop (2.1.3)
- truncato (0.7.10)
+ truncato (0.7.11)
htmlentities (~> 4.3.1)
- nokogiri (~> 1.8.0, >= 1.7.0)
+ nokogiri (>= 1.7.0, <= 2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
u2f (0.2.1)
@@ -890,7 +899,7 @@ GEM
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
- unicorn (5.1.0)
+ unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@@ -908,7 +917,7 @@ GEM
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
- version_sorter (2.1.0)
+ version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@@ -917,7 +926,7 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
- webmock (2.3.2)
+ webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@@ -957,7 +966,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
- bootsnap (~> 1.3)
+ bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.5)
@@ -974,7 +983,7 @@ DEPENDENCIES
connection_pool (~> 2.0)
creole (~> 0.5.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.0.0)
+ deckar01-task_list (= 2.2.0)
device_detector
devise (~> 4.4)
devise-two-factor (~> 3.0.0)
@@ -994,27 +1003,28 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
- fog-aliyun (~> 0.2.0)
- fog-aws (~> 2.0.1)
- fog-core (~> 1.44)
- fog-google (~> 1.7.1)
- fog-local (~> 0.3)
- fog-openstack (~> 0.1)
+ fog-aliyun (~> 0.3)
+ fog-aws (~> 3.3)
+ fog-core (= 2.1.0)
+ fog-google (~> 1.8)
+ fog-local (~> 0.6)
+ fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
+ fugit (~> 1.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.5.0)
+ gitaly-proto (~> 1.13.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
- gitlab_omniauth-ldap (~> 2.0.4)
+ gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
@@ -1031,20 +1041,20 @@ DEPENDENCIES
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
- hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
httparty (~> 0.13.3)
icalendar
influxdb (~> 0.2)
+ jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
- js_regex (~> 2.2.1)
+ js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 4.0.0)
+ kubeclient (~> 4.2.2)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
licensee (~> 8.9)
@@ -1059,7 +1069,7 @@ DEPENDENCIES
nakayoshi_fork (~> 0.0.4)
net-ldap
net-ssh (~> 5.0)
- nokogiri (~> 1.8.5)
+ nokogiri (~> 1.10.1)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1077,6 +1087,7 @@ DEPENDENCIES
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.2.0)
+ opentracing (~> 0.4.3)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
@@ -1084,7 +1095,7 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.5.1)
@@ -1107,7 +1118,6 @@ DEPENDENCIES
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)
- redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
@@ -1128,8 +1138,7 @@ DEPENDENCIES
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
- rufus-scheduler (~> 3.4)
- rugged (~> 0.27)
+ rugged (~> 0.28)
sanitize (~> 4.6)
sass (~> 3.5)
sass-rails (~> 5.0.6)
@@ -1142,14 +1151,14 @@ DEPENDENCIES
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
sidekiq (~> 5.2.1)
- sidekiq-cron (~> 0.6.0)
+ sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
- sshkey (~> 1.9.0)
+ sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@@ -1157,17 +1166,17 @@ DEPENDENCIES
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
- truncato (~> 0.7.9)
+ truncato (~> 0.7.11)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
- unicorn (~> 5.1.0)
+ unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
- version_sorter (~> 2.1.0)
+ version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 2.3.2)
+ webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 10b8c3f25ead..f3e2dd91d556 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -309,10 +309,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
- version = "1.3.2";
+ version = "1.4.1";
};
bootstrap_form = {
source = {
@@ -407,6 +407,14 @@
};
version = "0.1";
};
+ character_set = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -587,10 +595,10 @@
dependencies = ["html-pipeline"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
type = "gem";
};
- version = "2.0.0";
+ version = "2.2.0";
};
declarative = {
source = {
@@ -772,10 +780,10 @@
dependencies = ["tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
+ sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.7";
};
eventmachine = {
source = {
@@ -881,10 +889,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
- version = "1.9.25";
+ version = "1.10.0";
};
flipper = {
source = {
@@ -925,64 +933,64 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
+ sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
type = "gem";
};
- version = "2.0.1";
+ version = "3.3.0";
};
fog-core = {
- dependencies = ["builder" "excon" "formatador"];
+ dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
- version = "1.45.0";
+ version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
- version = "1.7.1";
+ version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
- version = "0.3.1";
+ version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
- version = "0.1.21";
+ version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1028,6 +1036,15 @@
};
version = "0.2.5";
};
+ fugit = {
+ dependencies = ["et-orbi" "raabro"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
+ type = "gem";
+ };
+ version = "1.1.7";
+ };
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
source = {
@@ -1085,10 +1102,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
- version = "1.5.0";
+ version = "1.13.0";
};
github-markup = {
source = {
@@ -1130,19 +1147,19 @@
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
+ sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa";
type = "gem";
};
- version = "2.4.1";
+ version = "2.5.1";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
- version = "2.0.4";
+ version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
@@ -1183,10 +1200,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1306,10 +1323,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.8";
};
hashie = {
source = {
@@ -1337,15 +1354,6 @@
};
version = "2.6.0";
};
- hipchat = {
- dependencies = ["httparty" "mimemagic"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
- type = "gem";
- };
- version = "1.5.2";
- };
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
source = {
@@ -1465,6 +1473,15 @@
};
version = "0.8.3";
};
+ jaeger-client = {
+ dependencies = ["opentracing" "thrift"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
jira-ruby = {
dependencies = ["activesupport" "multipart-post" "oauth"];
source = {
@@ -1483,13 +1500,13 @@
version = "1.3.2";
};
js_regex = {
- dependencies = ["regexp_parser"];
+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
type = "gem";
};
- version = "2.2.1";
+ version = "3.1.1";
};
json = {
source = {
@@ -1563,10 +1580,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
- version = "2.10.0";
+ version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@@ -1581,10 +1598,10 @@
dependencies = ["http" "recursive-open-struct" "rest-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
type = "gem";
};
- version = "4.0.0";
+ version = "4.2.2";
};
launchy = {
dependencies = ["addressable"];
@@ -1743,10 +1760,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -1759,10 +1776,10 @@
msgpack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.6";
};
multi_json = {
source = {
@@ -1857,10 +1874,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.1";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2067,6 +2084,22 @@
};
version = "2.2.3";
};
+ opentracing = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf";
+ type = "gem";
+ };
+ version = "0.4.3";
+ };
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
org-ruby = {
dependencies = ["rubypants"];
source = {
@@ -2174,10 +2207,10 @@
pg = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+ sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
type = "gem";
};
- version = "0.18.4";
+ version = "1.1.3";
};
po_to_json = {
dependencies = ["json"];
@@ -2299,6 +2332,14 @@
};
version = "0.0.3.3";
};
+ raabro = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
rack = {
source = {
remotes = ["https://rubygems.org"];
@@ -2346,10 +2387,10 @@
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.5";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2443,10 +2484,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
- version = "0.18.0";
+ version = "0.19.0";
};
rake = {
source = {
@@ -2483,13 +2524,13 @@
version = "0.3.6";
};
rbtrace = {
- dependencies = ["ffi" "msgpack" "trollop"];
+ dependencies = ["ffi" "msgpack" "optimist"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
type = "gem";
};
- version = "0.4.10";
+ version = "0.4.11";
};
rdoc = {
source = {
@@ -2524,14 +2565,6 @@
};
version = "1.1.0";
};
- redcarpet = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
RedCloth = {
source = {
remotes = ["https://rubygems.org"];
@@ -2605,10 +2638,18 @@
regexp_parser = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+ sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq";
type = "gem";
};
- version = "0.5.0";
+ version = "1.3.0";
+ };
+ regexp_property_values = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
+ type = "gem";
+ };
+ version = "0.3.4";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -2895,22 +2936,13 @@
};
version = "1.2.2";
};
- rufus-scheduler = {
- dependencies = ["et-orbi"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
- type = "gem";
- };
- version = "3.4.0";
- };
rugged = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.0";
};
safe_yaml = {
source = {
@@ -3045,22 +3077,22 @@
version = "3.1.2";
};
sidekiq = {
- dependencies = ["connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
+ sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29";
type = "gem";
};
- version = "5.2.3";
+ version = "5.2.5";
};
sidekiq-cron = {
- dependencies = ["rufus-scheduler" "sidekiq"];
+ dependencies = ["fugit" "sidekiq"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
type = "gem";
};
- version = "0.6.0";
+ version = "1.0.4";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3151,10 +3183,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
- version = "1.9.0";
+ version = "2.0.0";
};
stackprof = {
source = {
@@ -3256,6 +3288,14 @@
};
version = "0.3.6";
};
+ thrift = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ type = "gem";
+ };
+ version = "0.11.0.0";
+ };
tilt = {
source = {
remotes = ["https://rubygems.org"];
@@ -3298,22 +3338,14 @@
};
version = "1.0.0";
};
- trollop = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
- type = "gem";
- };
- version = "2.1.3";
- };
truncato = {
dependencies = ["htmlentities" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
type = "gem";
};
- version = "0.7.10";
+ version = "0.7.11";
};
tzinfo = {
dependencies = ["thread_safe"];
@@ -3378,10 +3410,10 @@
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
- version = "5.1.0";
+ version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@@ -3421,10 +3453,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3456,10 +3488,10 @@
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
- version = "2.3.2";
+ version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index f01944a0e877..2847bd3e6c27 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
-gem 'rugged', '~> 0.27'
+gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0'
gem 'faraday', '~> 0.12'
@@ -71,7 +71,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
-gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.7.1'
-gem 'fog-local', '~> 0.3'
-gem 'fog-openstack', '~> 0.1'
+gem 'fog-aws', '~> 3.3'
+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
+# Also see config/initializers/fog_core_patch.rb.
+gem 'fog-core', '= 2.1.0'
+gem 'fog-google', '~> 1.8'
+gem 'fog-local', '~> 0.6'
+gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.2.0'
+gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@@ -123,10 +125,9 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
+gem 'deckar01-task_list', '2.2.0'
gem 'gitlab-markup', '~> 1.6.5'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.0'
@@ -136,9 +137,9 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
-gem 'truncato', '~> 0.7.9'
+gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.5'
+gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -154,7 +155,7 @@ gem 'diffy', '~> 3.1.0'
gem 'rack', '2.0.6'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -171,12 +172,12 @@ gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
gem 'sidekiq', '~> 5.2.1'
-gem 'sidekiq-cron', '~> 0.6.0'
+gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
-gem 'rufus-scheduler', '~> 3.4'
+gem 'fugit', '~> 1.1'
# HTTP requests
gem 'httparty', '~> 0.13.3'
@@ -195,10 +196,10 @@ gem 're2', '~> 1.1.1'
# Misc
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing
gem 'device_detector'
@@ -213,9 +214,6 @@ gem 'connection_pool', '~> 2.0'
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
-# HipChat integration
-gem 'hipchat', '~> 1.5.0'
-
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -235,7 +233,7 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 4.0.0'
+gem 'kubeclient', '~> 4.2.2'
# Sanitize user input
gem 'sanitize', '~> 4.6'
@@ -317,6 +315,12 @@ group :metrics do
gem 'raindrops', '~> 0.18'
end
+group :tracing do
+ # OpenTracing
+ gem 'opentracing', '~> 0.4.3'
+ gem 'jaeger-client', '~> 0.10.0'
+end
+
group :development do
gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
@@ -333,7 +337,7 @@ group :development do
end
group :development, :test do
- gem 'bootsnap', '~> 1.3'
+ gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -390,7 +394,7 @@ group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
+ gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@@ -423,7 +427,7 @@ gem 'net-ntp'
# SSH host key support
gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -432,7 +436,8 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
+
gem 'grpc', '~> 1.15.0'
gem 'google-protobuf', '~> 3.6'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 8d07afb59bf1..251d759be059 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
binding_ninja (0.2.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.2)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -121,6 +121,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
+ character_set (1.1.2)
charlock_holmes (0.7.6)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
@@ -151,7 +152,7 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.0.0)
+ deckar01-task_list (2.2.0)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
@@ -206,7 +207,7 @@ GEM
erubi (1.7.1)
erubis (2.7.0)
escape_utils (1.2.1)
- et-orbi (1.0.3)
+ et-orbi (1.1.7)
tzinfo
eventmachine (1.2.7)
excon (0.62.0)
@@ -230,7 +231,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.9.25)
+ ffi (1.10.0)
flipper (0.13.0)
flipper-active_record (0.13.0)
activerecord (>= 3.2, < 6)
@@ -241,32 +242,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.2.0)
- fog-core (~> 1.27)
- fog-json (~> 1.0)
+ fog-aliyun (0.3.3)
+ fog-core
+ fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (2.0.1)
- fog-core (~> 1.38)
- fog-json (~> 1.0)
+ fog-aws (3.3.0)
+ fog-core (~> 2.1)
+ fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-core (1.45.0)
+ fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
- fog-google (1.7.1)
- fog-core
- fog-json
- fog-xml
+ mime-types
+ fog-google (1.8.2)
+ fog-core (<= 2.1.0)
+ fog-json (~> 1.2)
+ fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
- fog-json (1.0.2)
- fog-core (~> 1.0)
+ fog-json (1.2.0)
+ fog-core
multi_json (~> 1.10)
- fog-local (0.3.1)
- fog-core (~> 1.27)
- fog-openstack (0.1.21)
- fog-core (>= 1.40)
+ fog-local (0.6.0)
+ fog-core (>= 1.27, < 3.0)
+ fog-openstack (1.0.8)
+ fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@@ -282,6 +284,9 @@ GEM
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
+ fugit (1.1.7)
+ et-orbi (~> 1.1, >= 1.1.7)
+ raabro (~> 1.1)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
@@ -298,7 +303,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.5.0)
+ gitaly-proto (1.13.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@@ -307,11 +312,11 @@ GEM
gitlab-markup (1.6.5)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
- gitlab-styles (2.4.1)
+ gitlab-styles (2.5.1)
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
- gitlab_omniauth-ldap (2.0.4)
+ gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -330,7 +335,7 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.2)
+ googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@@ -380,15 +385,12 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
- hashdiff (0.3.4)
+ hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
- hipchat (1.5.2)
- httparty
- mimemagic
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
@@ -416,14 +418,19 @@ GEM
cause
json
ipaddress (0.8.3)
+ jaeger-client (0.10.0)
+ opentracing (~> 0.3)
+ thrift
jira-ruby (1.4.1)
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.3.1)
jquery-atwho-rails (1.3.2)
- js_regex (2.2.1)
- regexp_parser (>= 0.4.11, <= 0.5.0)
+ js_regex (3.1.1)
+ character_set (~> 1.1)
+ regexp_parser (~> 1.1)
+ regexp_property_values (~> 0.3)
json (1.8.6)
json-jwt (1.9.4)
activesupport
@@ -444,10 +451,10 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
- kgio (2.10.0)
+ kgio (2.11.2)
knapsack (1.17.0)
rake
- kubeclient (4.0.0)
+ kubeclient (4.2.2)
http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
@@ -490,9 +497,9 @@ GEM
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_mime (1.0.1)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
- msgpack (1.2.4)
+ msgpack (1.2.6)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -507,8 +514,8 @@ GEM
net-ssh (5.0.1)
netrc (0.11.0)
nio4r (2.3.1)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.1)
+ mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
numerizer (0.1.1)
@@ -574,6 +581,8 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
+ opentracing (0.4.3)
+ optimist (3.0.0)
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
@@ -605,7 +614,7 @@ GEM
atomic (>= 1.0.0)
peek
redis
- pg (0.18.4)
+ pg (1.1.3)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.1)
@@ -636,6 +645,7 @@ GEM
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
+ raabro (1.1.6)
rack (2.0.6)
rack-accept (0.4.5)
rack (>= 0.4)
@@ -648,7 +658,7 @@ GEM
httpclient (>= 2.4)
multi_json (>= 1.3.6)
rack (>= 1.1)
- rack-protection (2.0.4)
+ rack-protection (2.0.5)
rack
rack-proxy (0.6.0)
rack
@@ -687,23 +697,22 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
- raindrops (0.18.0)
+ raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbtrace (0.4.10)
+ rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
- trollop (>= 1.16.2)
+ optimist (>= 3.0.0)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.0.0)
json
recursive-open-struct (1.1.0)
- redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
@@ -723,7 +732,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.6.0)
redis (>= 2.2, < 5)
- regexp_parser (0.5.0)
+ regexp_parser (1.3.0)
+ regexp_property_values (0.3.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -805,9 +815,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
- rufus-scheduler (3.4.0)
- et-orbi (~> 1.0)
- rugged (0.27.5)
+ rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@@ -846,12 +854,13 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.2.3)
+ sidekiq (5.2.5)
connection_pool (~> 2.2, >= 2.2.2)
+ rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
- sidekiq-cron (0.6.0)
- rufus-scheduler (>= 3.3.0)
+ sidekiq-cron (1.0.4)
+ fugit (~> 1.1)
sidekiq (>= 4.2.1)
signet (0.11.0)
addressable (~> 2.3)
@@ -877,7 +886,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
- sshkey (1.9.0)
+ sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@@ -898,6 +907,7 @@ GEM
rack (>= 1, < 3)
thor (0.19.4)
thread_safe (0.3.6)
+ thrift (0.11.0.0)
tilt (2.0.8)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
@@ -905,10 +915,9 @@ GEM
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
- trollop (2.1.3)
- truncato (0.7.10)
+ truncato (0.7.11)
htmlentities (~> 4.3.1)
- nokogiri (~> 1.8.0, >= 1.7.0)
+ nokogiri (>= 1.7.0, <= 2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
u2f (0.2.1)
@@ -920,7 +929,7 @@ GEM
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
- unicorn (5.1.0)
+ unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@@ -938,7 +947,7 @@ GEM
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
- version_sorter (2.1.0)
+ version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@@ -947,7 +956,7 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
- webmock (2.3.2)
+ webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@@ -988,7 +997,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
- bootsnap (~> 1.3)
+ bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.5)
@@ -1005,7 +1014,7 @@ DEPENDENCIES
connection_pool (~> 2.0)
creole (~> 0.5.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.0.0)
+ deckar01-task_list (= 2.2.0)
device_detector
devise (~> 4.4)
devise-two-factor (~> 3.0.0)
@@ -1029,28 +1038,29 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
- fog-aliyun (~> 0.2.0)
- fog-aws (~> 2.0.1)
- fog-core (~> 1.44)
- fog-google (~> 1.7.1)
- fog-local (~> 0.3)
- fog-openstack (~> 0.1)
+ fog-aliyun (~> 0.3)
+ fog-aws (~> 3.3)
+ fog-core (= 2.1.0)
+ fog-google (~> 1.8)
+ fog-local (~> 0.6)
+ fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
+ fugit (~> 1.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.5.0)
+ gitaly-proto (~> 1.13.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-license (~> 1.0)
gitlab-markup (~> 1.6.5)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
- gitlab_omniauth-ldap (~> 2.0.4)
+ gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
@@ -1068,20 +1078,20 @@ DEPENDENCIES
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
- hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
httparty (~> 0.13.3)
icalendar
influxdb (~> 0.2)
+ jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
- js_regex (~> 2.2.1)
+ js_regex (~> 3.1)
json-schema (~> 2.8.0)
jwt (~> 2.1.0)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 4.0.0)
+ kubeclient (~> 4.2.2)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
licensee (~> 8.9)
@@ -1098,7 +1108,7 @@ DEPENDENCIES
net-ldap
net-ntp
net-ssh (~> 5.0)
- nokogiri (~> 1.8.5)
+ nokogiri (~> 1.10.1)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1116,6 +1126,7 @@ DEPENDENCIES
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.2.0)
+ opentracing (~> 0.4.3)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
@@ -1123,7 +1134,7 @@ DEPENDENCIES
peek-pg (~> 1.3.0)
peek-rblineprof (~> 0.2.0)
peek-redis (~> 1.2.0)
- pg (~> 0.18.2)
+ pg (~> 1.1)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.5.1)
@@ -1146,7 +1157,6 @@ DEPENDENCIES
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)
- redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
@@ -1167,8 +1177,7 @@ DEPENDENCIES
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
- rufus-scheduler (~> 3.4)
- rugged (~> 0.27)
+ rugged (~> 0.28)
sanitize (~> 4.6)
sass (~> 3.5)
sass-rails (~> 5.0.6)
@@ -1181,14 +1190,14 @@ DEPENDENCIES
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
sidekiq (~> 5.2.1)
- sidekiq-cron (~> 0.6.0)
+ sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1)
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
- sshkey (~> 1.9.0)
+ sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@@ -1196,17 +1205,17 @@ DEPENDENCIES
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
- truncato (~> 0.7.9)
+ truncato (~> 0.7.11)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
- unicorn (~> 5.1.0)
+ unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
- version_sorter (~> 2.1.0)
+ version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
- webmock (~> 2.3.2)
+ webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 03f885f2f9e5..c62c26b2bd10 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -344,10 +344,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
- version = "1.3.2";
+ version = "1.4.1";
};
bootstrap_form = {
source = {
@@ -442,6 +442,14 @@
};
version = "0.1";
};
+ character_set = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -622,10 +630,10 @@
dependencies = ["html-pipeline"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
type = "gem";
};
- version = "2.0.0";
+ version = "2.2.0";
};
declarative = {
source = {
@@ -851,10 +859,10 @@
dependencies = ["tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
+ sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.7";
};
eventmachine = {
source = {
@@ -969,10 +977,10 @@
ffi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
- version = "1.9.25";
+ version = "1.10.0";
};
flipper = {
source = {
@@ -1013,64 +1021,64 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
+ sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
type = "gem";
};
- version = "2.0.1";
+ version = "3.3.0";
};
fog-core = {
- dependencies = ["builder" "excon" "formatador"];
+ dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
- version = "1.45.0";
+ version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
- version = "1.7.1";
+ version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
- version = "0.3.1";
+ version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
- version = "0.1.21";
+ version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1116,6 +1124,15 @@
};
version = "0.2.5";
};
+ fugit = {
+ dependencies = ["et-orbi" "raabro"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
+ type = "gem";
+ };
+ version = "1.1.7";
+ };
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
source = {
@@ -1173,10 +1190,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
- version = "1.5.0";
+ version = "1.13.0";
};
github-markup = {
source = {
@@ -1226,19 +1243,19 @@
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
+ sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa";
type = "gem";
};
- version = "2.4.1";
+ version = "2.5.1";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
- version = "2.0.4";
+ version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
@@ -1279,10 +1296,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1411,10 +1428,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
- version = "0.3.4";
+ version = "0.3.8";
};
hashie = {
source = {
@@ -1442,15 +1459,6 @@
};
version = "2.6.0";
};
- hipchat = {
- dependencies = ["httparty" "mimemagic"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
- type = "gem";
- };
- version = "1.5.2";
- };
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
source = {
@@ -1570,6 +1578,15 @@
};
version = "0.8.3";
};
+ jaeger-client = {
+ dependencies = ["opentracing" "thrift"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
jira-ruby = {
dependencies = ["activesupport" "multipart-post" "oauth"];
source = {
@@ -1596,13 +1613,13 @@
version = "1.3.2";
};
js_regex = {
- dependencies = ["regexp_parser"];
+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
type = "gem";
};
- version = "2.2.1";
+ version = "3.1.1";
};
json = {
source = {
@@ -1676,10 +1693,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
- version = "2.10.0";
+ version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@@ -1694,10 +1711,10 @@
dependencies = ["http" "recursive-open-struct" "rest-client"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
type = "gem";
};
- version = "4.0.0";
+ version = "4.2.2";
};
launchy = {
dependencies = ["addressable"];
@@ -1856,10 +1873,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
@@ -1872,10 +1889,10 @@
msgpack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.6";
};
multi_json = {
source = {
@@ -1986,10 +2003,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.1";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2196,6 +2213,22 @@
};
version = "2.2.3";
};
+ opentracing = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf";
+ type = "gem";
+ };
+ version = "0.4.3";
+ };
+ optimist = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
org-ruby = {
dependencies = ["rubypants"];
source = {
@@ -2303,10 +2336,10 @@
pg = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+ sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
type = "gem";
};
- version = "0.18.4";
+ version = "1.1.3";
};
po_to_json = {
dependencies = ["json"];
@@ -2428,6 +2461,14 @@
};
version = "0.0.3.3";
};
+ raabro = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
rack = {
source = {
remotes = ["https://rubygems.org"];
@@ -2475,10 +2516,10 @@
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.5";
};
rack-proxy = {
dependencies = ["rack"];
@@ -2572,10 +2613,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
- version = "0.18.0";
+ version = "0.19.0";
};
rake = {
source = {
@@ -2612,13 +2653,13 @@
version = "0.3.6";
};
rbtrace = {
- dependencies = ["ffi" "msgpack" "trollop"];
+ dependencies = ["ffi" "msgpack" "optimist"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
type = "gem";
};
- version = "0.4.10";
+ version = "0.4.11";
};
rdoc = {
source = {
@@ -2653,14 +2694,6 @@
};
version = "1.1.0";
};
- redcarpet = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
RedCloth = {
source = {
remotes = ["https://rubygems.org"];
@@ -2734,10 +2767,18 @@
regexp_parser = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+ sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq";
type = "gem";
};
- version = "0.5.0";
+ version = "1.3.0";
+ };
+ regexp_property_values = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
+ type = "gem";
+ };
+ version = "0.3.4";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
@@ -3024,22 +3065,13 @@
};
version = "1.2.2";
};
- rufus-scheduler = {
- dependencies = ["et-orbi"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
- type = "gem";
- };
- version = "3.4.0";
- };
rugged = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
- version = "0.27.5";
+ version = "0.28.0";
};
safe_yaml = {
source = {
@@ -3174,22 +3206,22 @@
version = "3.1.2";
};
sidekiq = {
- dependencies = ["connection_pool" "rack-protection" "redis"];
+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
+ sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29";
type = "gem";
};
- version = "5.2.3";
+ version = "5.2.5";
};
sidekiq-cron = {
- dependencies = ["rufus-scheduler" "sidekiq"];
+ dependencies = ["fugit" "sidekiq"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
type = "gem";
};
- version = "0.6.0";
+ version = "1.0.4";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3280,10 +3312,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
- version = "1.9.0";
+ version = "2.0.0";
};
stackprof = {
source = {
@@ -3385,6 +3417,14 @@
};
version = "0.3.6";
};
+ thrift = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ type = "gem";
+ };
+ version = "0.11.0.0";
+ };
tilt = {
source = {
remotes = ["https://rubygems.org"];
@@ -3427,22 +3467,14 @@
};
version = "1.0.0";
};
- trollop = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
- type = "gem";
- };
- version = "2.1.3";
- };
truncato = {
dependencies = ["htmlentities" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
type = "gem";
};
- version = "0.7.10";
+ version = "0.7.11";
};
tzinfo = {
dependencies = ["thread_safe"];
@@ -3507,10 +3539,10 @@
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
- version = "5.1.0";
+ version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@@ -3550,10 +3582,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3585,10 +3617,10 @@
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
- version = "2.3.2";
+ version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index ad095ddbea51..aaa1737f99a1 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons,
+{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons,
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg,
enca, pkgconfig, fetchpatch }:
@@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
};
patches = map fetchPatchFromAur [
- {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
- {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
- {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
- {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
- {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
- {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
- {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
- {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
+ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
+ {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
+ {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
+ {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
+ {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
+ {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
+ {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
+ {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
];
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
- gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools
+ gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
libxmlxx ffmpeg enca
];
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 24a1f07fb0d2..f7ecbc23a309 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -44,14 +44,14 @@ assert vdpauSupport -> libvdpau != null;
let
kodiReleaseDate = "20190129";
- kodiVersion = "18.0";
+ kodiVersion = "18.1";
rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg";
+ sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc";
};
kodiDependency = { name, version, rev, sha256, ... } @attrs:
@@ -70,8 +70,8 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
version = "4.0.3";
- rev = "${version}-${rel}-RC5";
- sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx";
+ rev = "${version}-${rel}-18.2";
+ sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 4bfd9e790070..2b21a25434d5 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
fullPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc
- gnome3.gtk
+ gtk3
gdk_pixbuf
cairo
libjpeg_original
@@ -21,7 +21,7 @@ let
lightworks = stdenv.mkDerivation rec {
version = "14.0.0";
name = "lightworks-${version}";
-
+
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 5b786b255019..28056bf6cb81 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -11,14 +11,14 @@ assert withGUI -> qtbase != null && qtmultimedia != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "mkvtoolnix-${version}";
- version = "31.0.0";
+ pname = "mkvtoolnix";
+ version = "32.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh";
+ sha256 = "022mmgm0a6qxybjrygisg731sg9m9d8svd0mxr77wfknwa7m09c9";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 728f6387ffa9..374ea08816f7 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook
+{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
}:
stdenv.mkDerivation rec {
- name = "peek-${version}";
+ pname = "peek";
version = "1.3.1";
src = fetchFromGitHub {
owner = "phw";
- repo = "peek";
+ repo = pname;
rev = version;
sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
};
@@ -17,9 +17,21 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
'';
- nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
+ nativeBuildInputs = [
+ cmake
+ gettext
+ pkgconfig
+ libxml2.bin
+ txt2man
+ vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
+ wrapGAppsHook
+ ];
- buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ];
+ buildInputs = [
+ gsettings-desktop-schemas
+ gtk3
+ keybinder3
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 3683973824a3..135dabd68981 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
- desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
+ desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
}:
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
buildInputs = [
desktop-file-utils
enchant
- gnome3.gtk
- gnome3.gtkmm
+ gtk3
+ gtkmm3
gst_all_1.gstreamer
gst_all_1.gstreamermm
gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index cd3999e38c09..7f1233a4e04e 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -13,8 +13,13 @@
, jackSupport ? false
, fetchpatch
, removeReferencesTo
+, chromecastSupport ? true, protobuf, libmicrodns
}:
+# chromecastSupport requires TCP port 8010 to be open for it to work.
+# If your firewall is enabled, make sure to have something like:
+# networking.firewall.allowedTCPPorts = [ 8010 ];
+
with stdenv.lib;
assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
@@ -42,7 +47,8 @@ stdenv.mkDerivation rec {
fluidsynth wayland wayland-protocols
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
- ++ optional jackSupport libjack2;
+ ++ optional jackSupport libjack2
+ ++ optionals chromecastSupport [ protobuf libmicrodns ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
@@ -76,7 +82,12 @@ stdenv.mkDerivation rec {
# "--enable-foo" flags here
configureFlags = [
"--with-kde-solid=$out/share/apps/solid/actions"
- ] ++ optional onlyLibVLC "--disable-vlc";
+ ] ++ optional onlyLibVLC "--disable-vlc"
+ ++ optionals chromecastSupport [
+ "--enable-sout"
+ "--enable-chromecast"
+ "--enable-microdns"
+ ];
# Remove runtime dependencies on libraries
postConfigure = ''
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index b89ef1dd7bff..1801dd9eddb6 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,13 +5,13 @@ with lib;
buildGoPackage rec {
name = "runc-${version}";
- version = "1.0.0-rc6";
+ version = "1.0.0-rc7";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
+ sha256 = "1baryjpka8wmzc6c66bir12i390ix3641a06j33shpsb683ws3fj";
};
goPackagePath = "github.com/opencontainers/runc";
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 178d111d79aa..d9095d3911b6 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}";
- version = "0.9.0.2019-02-15";
+ version = "0.9.0.2019-03-21";
src = fetchFromGitHub {
owner = "greshake";
repo = "i3status-rust";
- rev = "2dc958995834b529a245c22c510b57d5c928c747";
- sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j";
+ rev = "18300e6b9259053b80c37aef56c958fe5f50062b";
+ sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh";
};
cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i";
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index fca796363844..6406a8aa12ca 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -187,6 +187,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.isMsp430 then "msp430"
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
else throw "unknown emulation for platform: ${targetPlatform.config}";
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 6efb447e1424..344f1abc8b26 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -45,13 +45,18 @@ rec {
, sha256
, os ? "linux"
, arch ? "amd64"
+
+ # This is used to set name to the pulled image
+ , finalImageName ? imageName
# This used to set a tag to the pulled image
, finalImageTag ? "latest"
- , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
+
+ , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar"
}:
runCommand name {
- inherit imageName imageDigest;
+ inherit imageDigest;
+ imageName = finalImageName;
imageTag = finalImageTag;
impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
outputHashMode = "flat";
@@ -62,7 +67,7 @@ rec {
SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
sourceURL = "docker://${imageName}@${imageDigest}";
- destNameTag = "${imageName}:${finalImageTag}";
+ destNameTag = "${finalImageName}:${finalImageTag}";
} ''
skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag"
'';
@@ -344,7 +349,7 @@ rec {
# Tar up the layer and throw it into 'layer.tar'.
echo "Packing layer..."
mkdir $out
- tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+ tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
# Compute a checksum of the tarball.
echo "Computing layer checksum..."
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 8a1b35f02d99..557a4dbf54b7 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -88,8 +88,9 @@ rec {
nixFromDockerHub = pullImage {
imageName = "nixos/nix";
imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
- sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z";
+ sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7";
finalImageTag = "2.2.1";
+ finalImageName = "nix";
};
# 5. example of multiple contents, emacs and vi happily coexisting
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index ff814c1f6130..4cf338b9b252 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -9,6 +9,7 @@ layerPath="./layers/$layerNumber"
echo "Creating layer #$layerNumber for $@"
mkdir -p "$layerPath"
+tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store
tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \
--mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 "$@"
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 0978f7e1756f..2999c3d4c1d9 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -11,7 +11,7 @@
rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
- (["-C codegen-units=1"] ++ extraRustcOpts);
+ (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
# Some platforms have different names for rustc.
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index b184d363d554..165b3414c6a3 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -22,7 +22,7 @@ let version_ = lib.splitString "-" crateVersion;
version = lib.splitString "." (lib.head version_);
rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
- (["-C codegen-units=1"] ++ extraRustcOpts);
+ (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
buildDeps = makeDeps buildDependencies;
authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0;
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix
index 8a0a62434ec0..14d997b2d5cf 100644
--- a/pkgs/build-support/rust/build-rust-crate/helpers.nix
+++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix
@@ -14,9 +14,8 @@
include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any (f:
let p = toString (src + ("/" + f));
- suff = lib.strings.removePrefix p path;
in
- suff == "" || (lib.strings.hasPrefix "/" suff)
+ p == path || (lib.strings.hasPrefix (p + "/") path)
) includedFiles
) src;
exclude = excludedFiles: src: builtins.filterSource (path: type:
diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix
index b7b79f2e2ca1..2f583e2fc4b2 100644
--- a/pkgs/data/fonts/b612/default.nix
+++ b/pkgs/data/fonts/b612/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, lib }:
let
- version = "1.003";
+ version = "1.008";
pname = "b612";
in
fetchzip rec {
name = "${pname}-font-${version}";
- url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip";
- sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464";
+ url = "https://github.com/polarsys/b612/archive/${version}.zip";
+ sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
postFetch = ''
mkdir -p $out/share/fonts/truetype/${pname}
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix
new file mode 100644
index 000000000000..54ddc95bf6cc
--- /dev/null
+++ b/pkgs/data/fonts/behdad-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "behdad-fonts";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "font-store";
+ repo = "BehdadFont";
+ rev = "v${version}";
+ sha256 = "0rlmyv82qmyy90zvkjnlva44ia7dyhiyk7axbq526v7zip3g79w0";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/behdad-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/behdad-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/font-store/BehdadFont;
+ description = "A Persian/Arabic Open Source Font";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 595a1c0d37f5..51f1d668cd24 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "5.7.2";
+ version = "5.8.1";
in fetchzip rec {
name = "font-awesome-${version}";
@@ -12,7 +12,7 @@ in fetchzip rec {
unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
'';
- sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al";
+ sha256 = "1fc177sgf4qd231dmpr7cwr1j03wzb927ylpng2gn94iksln924d";
meta = with stdenv.lib; {
description = "Font Awesome - OTF font";
diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix
new file mode 100644
index 000000000000..938ff272cbd9
--- /dev/null
+++ b/pkgs/data/fonts/gandom-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "gandom-fonts";
+ version = "0.6";
+
+ src = fetchFromGitHub {
+ owner = "rastikerdar";
+ repo = "gandom-font";
+ rev = "v${version}";
+ sha256 = "1pdbqhvcsz6aq3qgarhfd05ip0wmh7bxqkmxrwa0kgxsly6zxz9x";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/gandom-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/gandom-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rastikerdar/gandom-font;
+ description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 7936a216ada7..b394cb47157c 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -1,49 +1,55 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }:
+{ stdenv, fetchurl, fetchFromGitHub
+, mkfontdir, mkfontscale, bdf2psf, bdftopcf
+}:
stdenv.mkDerivation rec {
- name = "gohufont-2.0";
+ name = "gohufont-${version}";
+ version = "2.1";
- pcf = fetchurl {
- url = "http://font.gohu.org/gohufont-2.0.tar.gz";
- sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
+ src = fetchurl {
+ url = "http://font.gohu.org/${name}.tar.gz";
+ sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
};
- bdf = fetchurl {
- url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz";
- sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
+ bdf = fetchFromGitHub {
+ owner = "hchargois";
+ repo = "gohufont";
+ rev = "cc36b8c9fed7141763e55dcee0a97abffcf08224";
+ sha256 = "1hmp11mrr01b29phw0xyj4h9b92qz19cf56ssf6c47c5j2c4xmbv";
};
- nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ];
+ nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf bdftopcf ];
- unpackPhase = ''
- mkdir pcf bdf
- tar -xzf $pcf --strip-components=1 -C pcf
- tar -xzf $bdf --strip-components=1 -C bdf
+ buildPhase = ''
+ # convert bdf to psf fonts
+ build=$(pwd)
+ mkdir psf
+ cd ${bdf2psf}/usr/share/bdf2psf
+ for i in $bdf/*.bdf; do
+ bdf2psf \
+ --fb "$i" standard.equivalents \
+ ascii.set+useful.set+linux.set 512 \
+ "$build/psf/$(basename $i .bdf).psf"
+ done
+ cd $build
+
+ # convert hidpi variant to pcf
+ for i in $bdf/hidpi/*.bdf; do
+ name=$(basename $i .bdf).pcf
+ bdftopcf -o "$name" "$i"
+ done
'';
installPhase = ''
- # convert bdf to psf fonts
- sourceRoot="$(pwd)"
- mkdir psf
-
- cd "${bdf2psf}/usr/share/bdf2psf"
- for i in $sourceRoot/bdf/*.bdf; do
- bdf2psf --fb $i standard.equivalents \
- ascii.set+useful.set+linux.set 512 \
- "$sourceRoot/psf/$(basename $i .bdf).psf"
- done
- cd "$sourceRoot"
-
# install the psf fonts (for the virtual console)
fontDir="$out/share/consolefonts"
mkdir -p "$fontDir"
- mv psf/*.psf "$fontDir"
-
+ mv -t "$fontDir" psf/*.psf
# install the pcf fonts (for xorg applications)
fontDir="$out/share/fonts/misc"
mkdir -p "$fontDir"
- mv pcf/*.pcf.gz "$fontDir"
+ mv -t "$fontDir" *.pcf.gz *.pcf
cd "$fontDir"
mkfontdir
@@ -52,15 +58,15 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7";
+ outputHash = "0kl7k8idl0fnsap2c4j02i33z017p2s4gi2cgspy6ica46fczcc1";
meta = with stdenv.lib; {
description = ''
A monospace bitmap font well suited for programming and terminal use
'';
- homepage = http://font.gohu.org/;
- license = licenses.wtfpl;
- maintainers = with maintainers; [ epitrochoid ];
- platforms = platforms.linux;
+ homepage = http://font.gohu.org/;
+ license = licenses.wtfpl;
+ maintainers = with maintainers; [ epitrochoid rnhmjoj ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix
index 81d392982eec..c7bcebcf5b25 100644
--- a/pkgs/data/fonts/inter-ui/default.nix
+++ b/pkgs/data/fonts/inter-ui/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "3.3";
+ version = "3.4";
in fetchzip {
name = "inter-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256 = "17fv33ryvbla4f4mfgw7m7gjlwyjlni90a8gpb7jws1qzn0vgazg";
+ sha256 = "1dl4zc1a5dl9xkg094zmzy6bk7gms8vhsiln58ix7sffzcf3pri8";
meta = with stdenv.lib; {
homepage = https://rsms.me/inter/;
diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix
new file mode 100644
index 000000000000..1fdf88b79abe
--- /dev/null
+++ b/pkgs/data/fonts/manrope/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "manrope";
+ version = "3";
+ src = fetchFromGitHub {
+ owner = "sharanda";
+ repo = pname;
+ rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
+ sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs";
+ };
+ dontBuild = true;
+ installPhase = ''
+ install -Dm644 -t $out/share/fonts/opentype "desktop font"/*
+ '';
+ meta = with stdenv.lib; {
+ description = "Open-source modern sans-serif font family";
+ homepage = https://github.com/sharanda/manrope;
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix
new file mode 100644
index 000000000000..f40ee8da7502
--- /dev/null
+++ b/pkgs/data/fonts/nika-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "nika-fonts";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "font-store";
+ repo = "NikaFont";
+ rev = "v${version}";
+ sha256 = "16dhk87vmjnywl5wqsl9dzp12ddpfk57w08f7811m3ijqadscdwc";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/nika-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/nika-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/font-store/NikaFont/;
+ description = "Persian/Arabic Open Source Font";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix
new file mode 100644
index 000000000000..00f03b53078e
--- /dev/null
+++ b/pkgs/data/fonts/parastoo-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "parastoo-fonts";
+ version = "1.0.0-alpha5";
+
+ src = fetchFromGitHub {
+ owner = "rastikerdar";
+ repo = "parastoo-font";
+ rev = "v${version}";
+ sha256 = "1nya9cbbs6sgv2w3zyah3lb1kqylf922q3fazh4l7bi6zgm8q680";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/parastoo-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/parastoo-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rastikerdar/parastoo-font;
+ description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index add2c44cd480..fabaa8d491c8 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ricty-${version}";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchurl {
url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh";
- sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf";
+ sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6";
};
unpackPhase = ''
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix
new file mode 100644
index 000000000000..20545be3dcad
--- /dev/null
+++ b/pkgs/data/fonts/sahel-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "sahel-fonts";
+ version = "1.0.0-alpha22";
+
+ src = fetchFromGitHub {
+ owner = "rastikerdar";
+ repo = "sahel-font";
+ rev = "v${version}";
+ sha256 = "1kx7byzb5zxspq0i4cvgf4q7sm6xnhdnfyw9zrb1wfmdv3jzaz7p";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/sahel-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/sahel-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rastikerdar/sahel-font;
+ description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix
new file mode 100644
index 000000000000..620e2fdcfb9c
--- /dev/null
+++ b/pkgs/data/fonts/samim-fonts/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "samim-fonts";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "rastikerdar";
+ repo = "samim-font";
+ rev = "v${version}";
+ sha256 = "1mp0pgbn9r098ilajwzag7c21shwb13mq61ly9av0mfbpnhkkjqk";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/samim-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/samim-fonts
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rastikerdar/samim-font;
+ description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
new file mode 100644
index 000000000000..a474c3db779d
--- /dev/null
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation rec {
+ pname = "spleen";
+ version = "1.0.4";
+
+ src = fetchurl {
+ url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
+ sha256 = "1x62a5ygn3rpgzbaacz64rp8mn7saymdnxci4l3xasvsjjp60s3g";
+ };
+
+ buildPhase = "gzip -n9 *.pcf";
+ installPhase = ''
+ d="$out/share/fonts/X11/misc/spleen"
+ install -Dm644 *.pcf.gz -t $d
+ install -Dm644 *.bdf -t $d
+ install -m644 fonts.alias-spleen $d/fonts.alias
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Monospaced bitmap fonts";
+ homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
new file mode 100755
index 000000000000..408bd9a92644
--- /dev/null
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "vazir-fonts";
+ version = "19.2.0";
+
+ src = fetchFromGitHub {
+ owner = "rastikerdar";
+ repo = "vazir-font";
+ rev = "v${version}";
+ sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/vazir-fonts
+ cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts
+
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/rastikerdar/vazir-font;
+ description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.linarcx ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
index 78b6303188a2..28d68883d4b8 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf,
json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
deepin-wallpapers, deepin-desktop-schemas, deepin }:
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.dconf
- gnome3.gtk
- gnome3.libgtop
+ gtk3
+ libgtop
gnome3.zenity
bamf
json-glib
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
index be845d3c6bac..d2e29cd2cb8f 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.gtk
+ gtk3
gnome3.gnome-desktop
gnome3.gsettings-desktop-schemas
gnome3.libgudev
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 1a01bd307eaa..c27e380470a3 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-nautilus" # Do not build nautilus plugin
+ "--enable-ps"
"--enable-introspection"
(if supportXPS then "--enable-xps" else "--disable-xps")
];
diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix
index 49a71987e754..0866fd104d23 100644
--- a/pkgs/desktops/lxde/core/lxrandr/default.nix
+++ b/pkgs/desktops/lxde/core/lxrandr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }:
stdenv.mkDerivation rec {
- name = "lxrandr-0.3.1";
+ name = "lxrandr-0.3.2";
src = fetchurl {
url = "mirror://sourceforge/lxde/${name}.tar.xz";
- sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e";
+ sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
};
configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 1989ac8e12cc..d6d189624f17 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "engrampa-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libxml2
- gnome3.gtk
+ gtk3
mate.caja
hicolor-icon-theme
mate.mate-desktop
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 3b830f73c76a..22f100008aa8 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "eom-${version}";
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
librsvg
libxml2
shared-mime-info
- gnome3.gtk
- gnome3.libpeas
+ gtk3
+ libpeas
mate.mate-desktop
hicolor-icon-theme
];
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 975c80b1d0cf..8a707c78a510 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "marco-${version}";
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
libcanberra-gtk3
libgtop
gnome2.startup_notification
- gnome3.gtk
+ gtk3
gnome3.zenity
];
-
+
meta = with stdenv.lib; {
description = "MATE default window manager";
homepage = https://github.com/mate-desktop/marco;
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index f9f0689fa65f..0a562b1f3cc7 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-applets-${version}";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.gtk
- gnome3.gtksourceview
+ gtk3
+ gtksourceview3
gnome3.gucharmap
libwnck3
libgtop
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
];
configureFlags = [ "--enable-suid=no" ];
-
+
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 8697a150881b..d24198f5d7f4 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
- desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook
+ desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3
librsvg
libappindicator-gtk3
- gnome3.gtk
+ gtk3
gnome3.dconf
hicolor-icon-theme
mate.mate-desktop
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index e6a43e6b457d..7d957e749b0b 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-desktop-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.dconf
- gnome3.gtk
+ gtk3
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 643f67cd1e95..90b97cd2bfb4 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-media-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libxml2
libcanberra-gtk3
- gnome3.gtk
+ gtk3
mate.libmatemixer
mate.mate-desktop
];
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index e9f8b4b75b1f..91ed947c97cc 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3,
- libnotify, libwnck3, gnome3, mate, wrapGAppsHook }:
+ libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-notification-daemon-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3
libnotify
libwnck3
- gnome3.gtk
+ gtk3
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index a7d34fc85a64..64b6b333f5a3 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-panel-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libwnck3
librsvg
libxml2
- gnome3.gtk
+ gtk3
gnome3.dconf
mate.libmateweather
mate.mate-desktop
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index a9c162e59122..88f497f21de9 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-power-manager-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
itstool
libxml2
libcanberra-gtk3
- gnome3.gtk
+ gtk3
gnome3.libgnome-keyring
libnotify
dbus-glib
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 480304fcb1c6..3c47e50b9c82 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,6 +1,5 @@
-{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier
-, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
-, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
}:
stdenv.mkDerivation rec {
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
libnotify
nss
polkit
- gnome3.gtk
+ gtk3
gnome3.dconf
mate.mate-desktop
mate.libmatekbd
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index d71bb08dd5cb..b27804e50a55 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "pluma-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
enchant
libxml2
python
- gnome3.gtksourceview
- gnome3.libpeas
+ gtksourceview3
+ libpeas
gnome3.adwaita-icon-theme
mate.mate-desktop
];
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 2e90a96411a3..90f326fb8269 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "camera";
- version = "1.0.3";
+ version = "1.0.4";
name = "elementary-${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "05rjymflhwbkw8yc57rgi9n7lrhf4dpvfvlifdnazyqn9iiaxc46";
+ sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 9855a1394e59..d224dbce7891 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "files";
- version = "4.1.5";
+ version = "4.1.6";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0z0pisg7py2k6i31v18z5fgpj8x64m1s5clfq4vbbjrcjwx6dcx5";
+ sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 01fe35e4a8ee..19bf4ce098bc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "terminal";
- version = "5.3.3";
+ version = "5.3.4";
name = "elementary-${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1rhqfq5dn913g551ribycid4k8add2lanxkkqpv6zzdgvah26ni8";
+ sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index e47dc4c4060c..c661e4f21112 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0yy821hl26jfd9hyigqi7nmaf30iww0lhg9qzcwlfzsvvfwnxagi";
+ sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index e4d0db46923b..baf5becd3477 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
- version = "2.1.3";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0dvxmjziifffa2rm7h43ca5grhlcpih3rgik50mz808mqfxr4l1q";
+ sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
index 438ed79d1bb0..1b2dc835706d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch
@@ -1,7 +1,7 @@
-diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override
-index 6452c30..899972d 100644
---- a/debian/elementary-default-settings.gsettings-override
-+++ b/debian/elementary-default-settings.gsettings-override
+diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override
+index 1aef29c..08de164 100644
+--- a/overrides/default-settings.gschema.override
++++ b/overrides/default-settings.gschema.override
@@ -1,5 +1,5 @@
[net.launchpad.plank.dock.settings]
-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index f133324a81ec..39299d2c2eb7 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "default-settings";
- version = "5.0";
+ version = "5.1.0";
name = "elementary-${pname}-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0";
+ sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
};
passthru = {
@@ -21,16 +21,6 @@ stdenv.mkDerivation rec {
};
patches = [
- # See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release)
- (fetchpatch {
- url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch";
- sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l";
- })
- # See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release)
- (fetchpatch {
- url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch";
- sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x";
- })
./correct-override.patch
];
@@ -41,7 +31,7 @@ stdenv.mkDerivation rec {
cp -av settings.ini $out/etc/gtk-3.0
mkdir -p $out/share/glib-2.0/schemas
- cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override
+ cp -av overrides/default-settings.gschema.override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override
mkdir $out/etc/wingpanel.d
cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index bd5688f941b2..466e7b6f22fb 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank
+{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
, extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? []
}:
@@ -6,10 +6,11 @@
let
gsettingsOverridePackages = [
- gala
- epiphany
elementary-settings-daemon
+ epiphany
+ gala
gnome3.mutter
+ gsettings-desktop-schemas
gtk3
plank
] ++ extraGSettingsOverridePackages;
@@ -32,8 +33,6 @@ runCommand "elementary-gsettings-desktop-schemas" {}
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background]
- draw-background=true
- picture-options='zoom'
picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
primary-color='#000000'
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 6e3fe6c4ebf1..8e8b157aa229 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec {
# Remove some broken manpages.
rm -rf $out/man/ja*
+ # Remove embedded freetype to avoid problems like
+ # https://github.com/NixOS/nixpkgs/issues/57733
+ rm $out/lib/libfreetype.so
+
# for backward compatibility
ln -s $out $out/jre
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 9cc60003201c..ea305cc5c84c 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -1,25 +1,18 @@
-{ stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }:
+{ stdenv, fetchgit, flex, bison, pkgconfig, python2, swig, which }:
stdenv.mkDerivation rec {
pname = "dtc";
- version = "1.4.7";
+ version = "1.5.0";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
- sha256 = "0l787g1wmd4d6izsp91m5r2qms2h2jg2hhzllfi9qkbnplyz21wn";
+ sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh";
};
nativeBuildInputs = [ flex bison pkgconfig swig which ];
buildInputs = [ python2 ];
- patches = [
- # Fix setup.py
- (fetchpatch {
- url = "https://github.com/dezgeg/dtc/commit/d94a745148ba5c9198143ccc0f7d877fe498ab73.patch";
- sha256 = "0hpryx04j1swvmjisrfhvss08zzz4nxz9iv72lp4jdgg6vg0argl";
- })
- ];
postPatch = ''
patchShebangs pylibfdt/
'';
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index ce3395f0be03..f5572c077f31 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -322,6 +322,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
+ EXTRA_TARGET_FLAGS = optionals
+ (targetPlatform != hostPlatform && libcCross != null)
+ ([
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
+ ] ++ optionals (! crossStageStatic) [
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
+ ]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 3e355dc302d6..a88cf9c01165 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages
+{ stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
@@ -70,11 +70,9 @@ let
++ 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;
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 874580c87aab..da72c351ec66 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages
+{ stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
@@ -72,11 +72,9 @@ let
++ 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;
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 140cea22442e..d9c63edc9155 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages
+{ stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
@@ -32,6 +32,10 @@
, # 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 disable the large address space allocator
+ # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
@@ -72,11 +76,9 @@ let
++ 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;
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
@@ -164,8 +166,7 @@ stdenv.mkDerivation (rec {
"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/
+ ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7e670743f7fc..88b273500dc0 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages
+{ stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
@@ -30,6 +30,10 @@
, # 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 disable the large address space allocator
+ # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
@@ -69,11 +73,9 @@ let
++ 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;
+ toolsForTarget = [
+ pkgsBuildTarget.targetPackages.stdenv.cc
+ ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
@@ -159,8 +161,7 @@ stdenv.mkDerivation (rec {
"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/
+ ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index a88e2c48d03e..52f3ad497ad6 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -5,4 +5,5 @@ in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
+ system-fileio = doJailbreak super.system-fileio;
}
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 06187987b6c6..068d7b578dfe 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -105,6 +105,5 @@ in stdenv.mkDerivation {
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco];
- meta.broken = true;
meta.hydraPlatforms = [];
}
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 62c5a0de0a93..784d66a0f242 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,35 +1,32 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, spirv-tools, jq }:
-
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }:
stdenv.mkDerivation rec {
- name = "glslang-git-${version}";
- version = "2018-09-26";
+ name = "glslang-${version}";
+ version = "7.11.3113";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
- rev = "91ac4290bcf2cb930b4fb0981f09c00c0b6797e1";
- sha256 = "0q477pm0n495acnss16ddlf82a6i5l2dfmvc7r8yi0bgmgpzi4av";
+ rev = "${version}";
+ sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6";
};
- buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
+ nativeBuildInputs = [ cmake python bison jq ];
enableParallelBuilding = true;
postPatch = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
- ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers
+ ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
'';
preConfigure = ''
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
- if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
+ if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
exit 1;
fi
'';
- doCheck = false; # fails 3 out of 3 tests (ctest)
-
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Khronos reference front-end for GLSL and ESSL";
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index db3731c2fcaa..355b2559e98d 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
, mailcap, runtimeShell
-, buildPackages, targetPackages }:
+, buildPackages, pkgsTargetTarget
+}:
let
@@ -152,16 +153,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
- CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
- "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
- else if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${stdenv.cc.targetPrefix}cc"
+ CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
else
null;
- CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
- "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
- else if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${stdenv.cc.targetPrefix}c++"
+ CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
else
null;
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index d7bbd4eaf0fc..bcd2eacc7ecf 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
, mailcap, runtimeShell
-, buildPackages, targetPackages }:
+, buildPackages, pkgsTargetTarget
+}:
let
@@ -154,16 +155,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
- CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
- "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
- else if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${stdenv.cc.targetPrefix}cc"
+ CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
else
null;
- CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
- "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
- else if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${stdenv.cc.targetPrefix}c++"
+ CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
else
null;
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 876e474bed97..62934dd9eeb3 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,12 +7,12 @@
let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk";
- version = "152b1248.6";
+ version = "202b1483.37";
name = pname + "-" + version;
src = if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
- url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz";
+ url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz";
sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
}
else
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index ef53280b679c..a118e7ab73ba 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -4,13 +4,13 @@
, curl, git, unzip, gnutar, coreutils, sqlite }:
let
- name = "pakcs-2.0.2";
+ name = "pakcs-2.1.1";
# Don't switch to development release without a reason, because its
# source updates without version bump. Prefer current release instead.
src = fetchurl {
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
- sha256 = "1hm80gvpsifbsfi13i0iiv7f2b72ymw98bbrm6a8hjsbnfw55jvg";
+ sha256 = "112v9ynqfbbm4x770mcfrai9v5bh7c3zn7jka80pv6v4y65r778c";
};
curry-frontend = (haskellPackages.override {
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 767eafc456c0..749fbcc2fafb 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -2,14 +2,14 @@
cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
stdenv.mkDerivation ( rec {
- name = "ponyc-${version}";
- version = "0.27.0";
+ pname = "ponyc";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "ponylang";
- repo = "ponyc";
+ repo = pname;
rev = version;
- sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla";
+ sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
new file mode 100644
index 000000000000..28c651f9b16a
--- /dev/null
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+let
+ params = {
+ "8.8" = {
+ sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
+ };
+ "8.9" = {
+ sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ version = "1.1";
+ name = "coq${coq.coq-version}-coqhammer-${version}";
+
+ src = fetchFromGitHub {
+ owner = "lukaszcz";
+ repo = "coqhammer";
+ rev = "v${version}-coq${coq.coq-version}";
+ inherit (param) sha256;
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile.coq.local --replace \
+ '$(if $(COQBIN),$(COQBIN),`coqc -where | xargs dirname | xargs dirname`/bin/)' \
+ '$(out)/bin/'
+ substituteInPlace Makefile.coq.local --replace 'g++' 'c++' --replace 'gcc' 'cc'
+ '';
+
+ buildInputs = [ coq ] ++ (with coq.ocamlPackages; [
+ ocaml findlib camlp5
+ ]);
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+ meta = {
+ homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/";
+ description = "Automation for Dependent Type Theory";
+ license = stdenv.lib.licenses.lgpl21;
+ inherit (coq.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.hasAttr v params;
+ };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 298d8d581310..c439d2cca00d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -84,7 +84,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 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0";
+ sha256 = "08gw3b5gbbxs2dr3b4zf9xsvhbvpqjj4ikmvzmcvs3fh1q65xbgl";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1218,6 +1218,14 @@ self: super: {
})];
});
+ # Remove unecessary constraint:
+ # https://github.com/agrafix/superbuffer/pull/2
+ superbuffer = overrideCabal super.superbuffer (drv: {
+ postPatch = ''
+ sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal
+ '';
+ });
+
# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
pandoc = doDistribute super.pandoc_2_7_1;
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 2d382e906325..5a856032e47c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -67,4 +67,25 @@ self: super: {
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
stack = doJailbreak super.stack;
+ # Needs a recent version from the "develop" branch of the upstream git
+ # repository to compile with ghc 8.6.4.
+ liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint {
+ src = pkgs.fetchFromGitHub {
+ owner = "ucsd-progsys";
+ repo = "liquid-fixpoint";
+ rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9";
+ sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf";
+ };
+ version = "0.8.0.2-pre-release";
+ };
+ liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell {
+ src = pkgs.fetchFromGitHub {
+ owner = "ucsd-progsys";
+ repo = "liquidhaskell";
+ rev = "254e77da9cd36e95b72c526bfb9eec50d3447050";
+ sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza";
+ };
+ version = "0.8.6.0-pre-release";
+ };
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ff9934cd632c..439a7f4dfea3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -46,7 +46,7 @@ default-package-overrides:
# Newer versions don't work in LTS-12.x
- alsa-mixer < 0.3
- cassava-megaparsec < 2
- # LTS Haskell 13.13
+ # LTS Haskell 13.14
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -263,6 +263,7 @@ default-package-overrides:
- bazel-runfiles ==0.7.0.1
- bbdb ==0.8
- bcrypt ==0.0.11
+ - beam-core ==0.8.0.0
- bench ==1.0.12
- benchpress ==0.2.2.12
- bencode ==0.6.0.0
@@ -386,7 +387,7 @@ default-package-overrides:
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
- check-email ==1.0.2
- - checkers ==0.4.11
+ - checkers ==0.4.14
- checksum ==0.0
- choice ==0.2.2
- chronologique ==0.3.1.1
@@ -600,7 +601,7 @@ default-package-overrides:
- direct-sqlite ==2.3.24
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- - distributed-closure ==0.4.1
+ - distributed-closure ==0.4.1.1
- distribution-opensuse ==1.1.1
- distributive ==0.6
- dlist ==0.8.0.5
@@ -743,7 +744,7 @@ default-package-overrides:
- fmt ==0.6.1.1
- fn ==0.3.0.2
- focus ==1.0.1.2
- - focuslist ==0.1.0.1
+ - focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.8
- fold-debounce-conduit ==0.2.0.3
@@ -1034,7 +1035,7 @@ default-package-overrides:
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- http2 ==1.6.4
- - HTTP ==4000.3.12
+ - HTTP ==4000.3.13
- http-api-data ==0.4
- http-client ==0.5.14
- http-client-tls ==0.3.5.3
@@ -1134,7 +1135,7 @@ default-package-overrides:
- io-storage ==0.3
- io-streams ==1.5.1.0
- io-streams-haproxy ==1.0.1.0
- - ip ==1.4.2
+ - ip ==1.4.2.1
- ip6addr ==1.0.0
- iproute ==1.7.7
- IPv6Addr ==1.1.2
@@ -1153,6 +1154,7 @@ default-package-overrides:
- jack ==0.7.1.4
- jose ==0.8.0.0
- jose-jwt ==0.8.0
+ - js-dgtable ==0.5.2
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.9.3
@@ -1188,7 +1190,7 @@ default-package-overrides:
- lame ==0.1.1
- language-c ==0.8.2
- language-c-quote ==0.12.2
- - language-docker ==8.0.1
+ - language-docker ==8.0.2
- language-ecmascript ==0.19
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
@@ -1268,7 +1270,7 @@ default-package-overrides:
- machines-directory ==0.2.1.0
- machines-io ==0.2.0.13
- mainland-pretty ==0.7
- - main-tester ==0.2.0.0
+ - main-tester ==0.2.0.1
- makefile ==1.1.0.0
- managed ==1.0.6
- mapquest-api ==0.3.1
@@ -1294,7 +1296,7 @@ default-package-overrides:
- mega-sdist ==0.3.3.2
- memory ==0.14.18
- MemoTrie ==0.6.9
- - menshen ==0.0.1
+ - menshen ==0.0.2
- mercury-api ==0.1.0.2
- merkle-tree ==0.1.1
- mersenne-random-pure64 ==0.2.2.0
@@ -1401,7 +1403,7 @@ default-package-overrides:
- ndjson-conduit ==0.1.0.5
- neat-interpolation ==0.3.2.4
- netlib-ffi ==0.1.1
- - netpbm ==1.0.2
+ - netpbm ==1.0.3
- netrc ==0.2.0.0
- nettle ==0.3.0
- netwire ==5.0.3
@@ -1840,7 +1842,7 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
- - simple-cmd ==0.1.3
+ - simple-cmd ==0.1.3.1
- simple-cmd-args ==0.1.0.1
- simple-log ==0.9.11
- simple-reflect ==0.3.3
@@ -2050,7 +2052,7 @@ default-package-overrides:
- th-strict-compat ==0.1.0.1
- th-utilities ==0.2.1.0
- thyme ==0.3.5.5
- - tidal ==1.0.8
+ - tidal ==1.0.10
- tile ==0.3.0.0
- time-compat ==0.1.0.3
- timeit ==2.0
@@ -2154,7 +2156,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.12.0
+ - util ==0.1.13.0
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2231,7 +2233,7 @@ default-package-overrides:
- webrtc-vad ==0.1.0.3
- websockets ==0.12.5.3
- websockets-snap ==0.10.3.0
- - weigh ==0.0.13
+ - weigh ==0.0.14
- wide-word ==0.1.0.8
- wikicfp-scraper ==0.1.0.10
- wild-bind ==0.1.2.3
@@ -2304,7 +2306,7 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1
- yesod-auth-oauth2 ==0.6.1.1
- yesod-bin ==1.6.0.3
- - yesod-core ==1.6.12
+ - yesod-core ==1.6.13
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -2429,6 +2431,8 @@ package-maintainers:
- lambdabot-core
- lambdabot-irc-plugins
- language-nix
+ - liquid-fixpoint
+ - liquidhaskell
- logging-facade-syslog
- nix-paths
- pandoc
@@ -2816,6 +2820,7 @@ broken-packages:
- applicative-parsec
- applicative-quoters
- applicative-splice
+ - approveapi
- ApproxFun-hs
- arb-fft
- arbb-vm
@@ -3003,6 +3008,7 @@ broken-packages:
- beam
- beam-core
- beam-migrate
+ - beam-mysql
- beam-newtype-field
- beam-postgres
- beam-sqlite
@@ -3092,6 +3098,7 @@ broken-packages:
- BiobaseBlast
- BiobaseDotP
- BiobaseEnsembl
+ - BiobaseFasta
- BiobaseFR3D
- BiobaseHTTP
- BiobaseHTTPTools
@@ -3100,6 +3107,7 @@ broken-packages:
- BiobaseNewick
- BiobaseTrainingData
- BiobaseTurner
+ - BiobaseTypes
- BiobaseVienna
- BiobaseXNA
- biocore
@@ -3423,6 +3431,7 @@ broken-packages:
- Checked
- checked
- checkmate
+ - chessIO
- chevalier-common
- chiasma
- chitauri
@@ -5528,6 +5537,7 @@ broken-packages:
- hist-pl-types
- historian
- hit-graph
+ - hit-on
- HJavaScript
- hjcase
- hjs
@@ -6319,6 +6329,7 @@ broken-packages:
- Ketchup
- keter
- kevin
+ - keycloak-hs
- keyed
- keyring
- keysafe
@@ -6568,8 +6579,6 @@ broken-packages:
- lio-simple
- lipsum-gen
- liquid
- - liquid-fixpoint
- - liquidhaskell
- liquidhaskell-cabal
- liquidhaskell-cabal-demo
- list-fusion-probe
@@ -6772,6 +6781,7 @@ broken-packages:
- matplotlib
- matrix-as-xyz
- matsuri
+ - matterhorn
- maude
- maxent
- maxent-learner-hw
@@ -6983,6 +6993,8 @@ broken-packages:
- more-containers
- morfette
- morfeusz
+ - morley
+ - morley-prelude
- morph
- morphisms-functors
- morphisms-functors-inventory
@@ -7177,6 +7189,7 @@ broken-packages:
- neural
- neural-network-blashs
- neural-network-hmatrix
+ - newhope
- newports
- newt
- newtype-deriving
@@ -7861,6 +7874,7 @@ broken-packages:
- quickcheck-state-machine
- quickcheck-state-machine-distributed
- quickcheck-webdriver
+ - quickcheck-with-counterexamples
- QuickCheckVariant
- QuickPlot
- quickpull
@@ -7994,6 +8008,7 @@ broken-packages:
- reflection-extras
- reflex
- reflex-animation
+ - reflex-basic-host
- reflex-dom-core
- reflex-gloss
- reflex-gloss-scene
@@ -8263,6 +8278,7 @@ broken-packages:
- scholdoc-citeproc
- scholdoc-texmath
- scholdoc-types
+ - SciBaseTypes
- science-constants-dimensional
- scion
- scion-browser
@@ -8529,6 +8545,7 @@ broken-packages:
- skeletons
- skell
- skemmtun
+ - skews
- skulk
- skylark-client
- skype4hs
@@ -8871,7 +8888,6 @@ broken-packages:
- sunroof-server
- super-user-spark
- superbubbles
- - superbuffer
- supercollider-ht
- supercollider-midi
- superconstraints
@@ -8907,6 +8923,7 @@ broken-packages:
- symantic
- symantic-cli
- symantic-grammar
+ - symantic-http-test
- symantic-lib
- symengine
- symengine-hs
@@ -8949,6 +8966,7 @@ broken-packages:
- Tablify
- tabloid
- tabs
+ - taffybar
- tag-bits
- tag-stream
- tagged-exception-core
@@ -8973,6 +8991,7 @@ broken-packages:
- tamper
- Tape
- target
+ - tart
- task
- task-distribution
- taskell
@@ -8997,6 +9016,7 @@ broken-packages:
- tcp-streams-openssl
- tdd-util
- tdigest-Chart
+ - tds
- TeaHS
- teams
- teeth
@@ -9029,6 +9049,7 @@ broken-packages:
- terminal-punch
- terminal-text
- termination-combinators
+ - termonad
- termplot
- terntup
- terrahs
@@ -9200,6 +9221,7 @@ broken-packages:
- traced
- tracetree
- tracker
+ - trackit
- traction
- tracy
- traildb
@@ -9223,6 +9245,7 @@ broken-packages:
- trasa
- trasa-client
- trasa-server
+ - trasa-th
- travis
- travis-meta-yaml
- trawl
@@ -9753,6 +9776,7 @@ broken-packages:
- xml-tydom-core
- xml2json
- xml2x
+ - xmlbf-xmlhtml
- XmlHtmlWriter
- XMLParser
- xmltv
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index fac0a419bfd1..af5bd2220d47 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,6 +94,8 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
+ cachix = enableSeparateBinOutput super.cachix;
+
hzk = overrideCabal super.hzk (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a6fd7bb0ba96..a8d530516a5e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -73,6 +73,7 @@ in
, coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false
, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all"
+, enableSeparateBinOutput ? false
, enableSeparateDataOutput ? false
, enableSeparateDocOutput ? doHaddock
, # Don't fail at configure time if there are multiple versions of the
@@ -80,6 +81,10 @@ in
# built. Will delay failures, if any, to compile time.
allowInconsistentDependencies ? false
, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221
+, # Build a pre-linked .o file for this Haskell library. This can make it
+ # slightly faster to load this library into GHCi, but takes extra disk space
+ # and compile time.
+ enableLibraryForGhci ? true
} @ args:
assert editedCabalFile != null -> revision != null;
@@ -111,6 +116,8 @@ let
# the target dir for haddock documentation
docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version;
+ binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin";
+
newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
newCabalFile = fetchurl {
url = newCabalFileUrl;
@@ -143,7 +150,10 @@ let
buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
defaultConfigureFlags = [
- "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname"
+ "--verbose"
+ "--prefix=$out"
+ "--libdir=\\$prefix/lib/\\$compiler"
+ "--libsubdir=\\$abi/\\$libname"
(optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
(optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
"--with-gcc=$CC" # Clang won't work without that extra information.
@@ -163,7 +173,7 @@ let
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
(enableFeature doBenchmark "benchmarks")
"--enable-library-vanilla" # TODO: Should this be configurable?
- "--enable-library-for-ghci" # TODO: Should this be configurable?
+ (enableFeature enableLibraryForGhci "library-for-ghci")
] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
"--ghc-option=-split-sections"
] ++ optionals dontStrip [
@@ -173,7 +183,8 @@ let
"--ghcjs"
] ++ optionals isCross ([
"--configure-option=--host=${stdenv.hostPlatform.config}"
- ] ++ crossCabalFlags);
+ ] ++ crossCabalFlags
+ ) ++ optionals enableSeparateBinOutput ["--bindir=${binDir}"];
setupCompileFlags = [
(optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
@@ -233,7 +244,10 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
stdenv.mkDerivation ({
name = "${pname}-${version}";
- outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc");
+ outputs = [ "out" ]
+ ++ (optional enableSeparateDataOutput "data")
+ ++ (optional enableSeparateDocOutput "doc")
+ ++ (optional enableSeparateBinOutput "bin");
setOutputFlags = false;
pos = builtins.unsafeGetAttrPos "pname" args;
@@ -414,7 +428,7 @@ stdenv.mkDerivation ({
find $packageConfDir -maxdepth 0 -empty -delete;
''}
${optionalString isGhcjs ''
- for exeDir in "$out/bin/"*.jsexe; do
+ for exeDir in "${binDir}/"*.jsexe; do
exe="''${exeDir%.jsexe}"
printWords '#!${nodejs}/bin/node' > "$exe"
echo >> "$exe"
@@ -424,7 +438,7 @@ stdenv.mkDerivation ({
''}
${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
- for exe in "$out/bin/"* ; do
+ for exe in "${binDir}/"* ; do
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
done
''}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 20968e540378..107625226945 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1570,26 +1570,29 @@ self: {
}) {};
"BiobaseFasta" = callPackage
- ({ mkDerivation, base, BiobaseTypes, bytestring, deepseq, filepath
- , lens, QuickCheck, resourcet, streaming, streaming-bytestring
- , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, tasty-silver
- , tasty-th, text
+ ({ mkDerivation, base, BiobaseTypes, bytestring, filepath, lens
+ , QuickCheck, resourcet, streaming, streaming-bytestring
+ , string-conversions, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, tasty-silver, tasty-th, text
}:
mkDerivation {
pname = "BiobaseFasta";
- version = "0.2.0.0";
- sha256 = "1ilsq8wjvmz1pw00rfk78f1si7s4ld3gbbp6w8nfq051hgg5ydsh";
+ version = "0.3.0.0";
+ sha256 = "0ka04dfgqv031k17dwnxkrq77r7xzmmbj8byrdrqr7r0z0ad0ns1";
libraryHaskellDepends = [
- base BiobaseTypes bytestring deepseq lens resourcet streaming
- streaming-bytestring
+ base BiobaseTypes bytestring lens resourcet streaming
+ streaming-bytestring string-conversions
];
testHaskellDepends = [
- base bytestring filepath QuickCheck resourcet streaming
- streaming-bytestring tasty tasty-golden tasty-hunit
- tasty-quickcheck tasty-silver tasty-th text
+ base BiobaseTypes bytestring filepath lens QuickCheck resourcet
+ streaming streaming-bytestring string-conversions tasty
+ tasty-golden tasty-hunit tasty-quickcheck tasty-silver tasty-th
+ text
];
description = "streaming FASTA parser";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BiobaseHTTP" = callPackage
@@ -1764,8 +1767,8 @@ self: {
}:
mkDerivation {
pname = "BiobaseTypes";
- version = "0.1.4.0";
- sha256 = "1ih3l72i9ahgxb261y43gncdrha3jpzkpavvhbsyqv6vi7pgcj4r";
+ version = "0.2.0.0";
+ sha256 = "16irdkcrih8b1mnjmnzq1bz2hbn02ayzhsmx97fqvy9py21mvrgv";
libraryHaskellDepends = [
aeson attoparsec base bimaps binary bytestring cereal cereal-text
cereal-vector containers data-default deepseq ForestStructures
@@ -1778,6 +1781,8 @@ self: {
];
description = "Collection of types for bioinformatics";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BiobaseVienna" = callPackage
@@ -2784,8 +2789,8 @@ self: {
}:
mkDerivation {
pname = "Chart";
- version = "1.9";
- sha256 = "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z";
+ version = "1.9.1";
+ sha256 = "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l";
libraryHaskellDepends = [
array base colour data-default-class lens mtl old-locale
operational time vector
@@ -2802,8 +2807,8 @@ self: {
}:
mkDerivation {
pname = "Chart-cairo";
- version = "1.9";
- sha256 = "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr";
+ version = "1.9.1";
+ sha256 = "0hknj4rsjf2m8p5pyq5zff8ai7v80yvmxb5c6n0bkgxs4317nbl9";
libraryHaskellDepends = [
array base cairo Chart colour data-default-class lens mtl
old-locale operational time
@@ -2822,8 +2827,8 @@ self: {
}:
mkDerivation {
pname = "Chart-diagrams";
- version = "1.9";
- sha256 = "1n1fa6198yp5iv7xy0fdxfj794kkll0w7kn2zdq7g52rfx6nkall";
+ version = "1.9.1";
+ sha256 = "188zy20ahz51c8jwp41ij1pp8vanpmfv77bjzafwcib6gjbjlp77";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base blaze-markup bytestring Chart colour containers
@@ -2843,8 +2848,8 @@ self: {
}:
mkDerivation {
pname = "Chart-gtk";
- version = "1.9";
- sha256 = "1p8nf50q031xa1mhv4w3zbyv61i2jyhvd8bq7dqkcqhgknxxpkv0";
+ version = "1.9.1";
+ sha256 = "1lhl7ayyydg5z5zwpr3k4313565p4za3z2f3ngd4hpicp7zbmhx0";
libraryHaskellDepends = [
array base cairo Chart Chart-cairo colour data-default-class gtk
mtl old-locale time
@@ -3833,27 +3838,35 @@ self: {
"DPutils" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, criterion, kan-extensions, lens, mtl, parallel, pipes
- , pipes-bytestring, pipes-parse, QuickCheck, streaming
- , streaming-bytestring, stringsearch, tasty, tasty-quickcheck
- , tasty-th, timeit, transformers, vector
+ , pipes-bytestring, pipes-parse, primitive, QuickCheck, smallcheck
+ , streaming, streaming-bytestring, stringsearch, tasty
+ , tasty-quickcheck, tasty-smallcheck, tasty-th, timeit
+ , transformers, vector
}:
mkDerivation {
pname = "DPutils";
- version = "0.0.2.0";
- sha256 = "0axavxxg0n1dsdby8306yrinjhbfrvy5a27kkwiw75xvjprk4w5w";
+ version = "0.1.0.0";
+ sha256 = "153g1rr13jjwqkvfj85nwjhaa0zq8khn24n3dib80nyk0scd4w62";
libraryHaskellDepends = [
- attoparsec base bytestring containers kan-extensions parallel pipes
- QuickCheck streaming streaming-bytestring stringsearch transformers
+ attoparsec base bytestring containers criterion kan-extensions lens
+ mtl parallel pipes pipes-bytestring pipes-parse primitive
+ QuickCheck smallcheck streaming streaming-bytestring stringsearch
+ tasty tasty-quickcheck tasty-smallcheck tasty-th transformers
vector
];
testHaskellDepends = [
- base bytestring containers lens mtl pipes pipes-bytestring
- pipes-parse QuickCheck streaming streaming-bytestring tasty
- tasty-quickcheck tasty-th vector
+ attoparsec base bytestring containers criterion kan-extensions lens
+ mtl parallel pipes pipes-bytestring pipes-parse primitive
+ QuickCheck smallcheck streaming streaming-bytestring stringsearch
+ tasty tasty-quickcheck tasty-smallcheck tasty-th transformers
+ vector
];
benchmarkHaskellDepends = [
- base bytestring criterion streaming streaming-bytestring timeit
- vector
+ attoparsec base bytestring containers criterion kan-extensions lens
+ mtl parallel pipes pipes-bytestring pipes-parse primitive
+ QuickCheck smallcheck streaming streaming-bytestring stringsearch
+ tasty tasty-quickcheck tasty-smallcheck tasty-th timeit
+ transformers vector
];
description = "utilities for DP";
license = stdenv.lib.licenses.bsd3;
@@ -8553,6 +8566,8 @@ self: {
pname = "HPDF";
version = "1.4.10";
sha256 = "1m072rc03yx5y4djmvj87kn6n23d9378v3ipl8lj3vzfjgfzsayy";
+ revision = "1";
+ editedCabalFile = "1djn0a9rk3qrbz31bxj115r65p28fi3wzcrkrnjvzibl3450pq30";
libraryHaskellDepends = [
array base base64-bytestring binary bytestring containers errors
mtl random vector zlib
@@ -9030,24 +9045,20 @@ self: {
}) {};
"HTTP" = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
- , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
- , network, network-uri, parsec, pureMD5, split, test-framework
- , test-framework-hunit, time, wai, warp
+ ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed
+ , HUnit, mtl, network, network-uri, parsec, pureMD5, split
+ , test-framework, test-framework-hunit, time
}:
mkDerivation {
pname = "HTTP";
- version = "4000.3.12";
- sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
- revision = "2";
- editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c";
+ version = "4000.3.13";
+ sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657";
libraryHaskellDepends = [
array base bytestring mtl network network-uri parsec time
];
testHaskellDepends = [
- base bytestring case-insensitive conduit conduit-extra deepseq
- http-types httpd-shed HUnit mtl network network-uri pureMD5 split
- test-framework test-framework-hunit wai warp
+ base bytestring deepseq httpd-shed HUnit mtl network network-uri
+ pureMD5 split test-framework test-framework-hunit
];
description = "A library for client-side HTTP";
license = stdenv.lib.licenses.bsd3;
@@ -10305,23 +10316,22 @@ self: {
}) {};
"HsHTSLib" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-lexing, conduit
- , containers, inline-c, mtl, tasty, tasty-golden, tasty-hunit
- , template-haskell, vector, zlib
+ ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, conduit
+ , containers, tasty, tasty-golden, tasty-hunit, vector, zlib
}:
mkDerivation {
pname = "HsHTSLib";
- version = "1.3.2.4";
- sha256 = "07zgbmk7511n0r7z7zdiryqxrxp000pq5wjdlhnr2ljahz53qnsq";
+ version = "1.9.2";
+ sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005";
libraryHaskellDepends = [
- base bytestring bytestring-lexing conduit containers inline-c mtl
- template-haskell
+ base bytestring bytestring-lexing conduit containers
];
librarySystemDepends = [ zlib ];
+ libraryToolDepends = [ c2hs ];
testHaskellDepends = [
- base bytestring conduit mtl tasty tasty-golden tasty-hunit vector
+ base bytestring conduit tasty tasty-golden tasty-hunit vector
];
- description = "High level bindings to htslib";
+ description = "Bindings to htslib";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -12817,8 +12827,10 @@ self: {
}:
mkDerivation {
pname = "MiniAgda";
- version = "0.2018.11.6";
- sha256 = "0zv8n80qmdykj40nqbrxb29grmy4kzjfhjxbyy3d7ylb64rq514n";
+ version = "0.2019.3.29";
+ sha256 = "1lix2p2ly6pjag1gkqfjfdm1jnq5rd9hqgr940jbkgyna75hk9a9";
+ revision = "1";
+ editedCabalFile = "1hiz5g69n1fwknwq7lhq01kzn4cm53zd6l62r747pdc30xm04rqr";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -13103,8 +13115,8 @@ self: {
pname = "MonadRandom";
version = "0.5.1.1";
sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb";
- revision = "1";
- editedCabalFile = "14izcj2myfsvfwiy1w78q5zddxd6za77yy6b8zwb1x49lnw7jpck";
+ revision = "2";
+ editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k";
libraryHaskellDepends = [
base mtl primitive random transformers transformers-compat
];
@@ -13542,8 +13554,8 @@ self: {
({ mkDerivation, base, containers, ghc-prim, vector }:
mkDerivation {
pname = "Naperian";
- version = "0.1.0.1";
- sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc";
+ version = "0.1.1.0";
+ sha256 = "1i9hc1pdp9mg9x1xd4wrv06cbhjxw0yhyk2xhsm8jz6rgksa22j7";
libraryHaskellDepends = [ base containers ghc-prim vector ];
description = "Naperian Functors for APL-like programming";
license = "unknown";
@@ -15336,16 +15348,19 @@ self: {
}:
mkDerivation {
pname = "PrimitiveArray";
- version = "0.9.0.0";
- sha256 = "0zhv17cjdppli5q66j1yabbgx3ad172w4jj4zhn0va2wsc9fs5vi";
+ version = "0.9.1.0";
+ sha256 = "1kz3jvq4bc7hap7633a87nbgp9gi081qnnhmld26j8rj7wdzkrbp";
libraryHaskellDepends = [
- aeson base binary bits cereal cereal-vector deepseq DPutils
- hashable lens log-domain mtl OrderedBits primitive QuickCheck
- smallcheck text vector vector-binary-instances vector-th-unbox
+ aeson base binary bits cereal cereal-vector containers deepseq
+ DPutils hashable lens log-domain mtl OrderedBits primitive
+ QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
+ tasty-th text vector vector-binary-instances vector-th-unbox
];
testHaskellDepends = [
- base containers QuickCheck smallcheck tasty tasty-quickcheck
- tasty-smallcheck tasty-th
+ aeson base binary bits cereal cereal-vector containers deepseq
+ DPutils hashable lens log-domain mtl OrderedBits primitive
+ QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
+ tasty-th text vector vector-binary-instances vector-th-unbox
];
description = "Efficient multidimensional arrays";
license = stdenv.lib.licenses.bsd3;
@@ -15719,6 +15734,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "QuickCheck_2_13_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, process, random
+ , splitmix, template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "QuickCheck";
+ version = "2.13.1";
+ sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6";
+ libraryHaskellDepends = [
+ base containers deepseq random splitmix template-haskell
+ transformers
+ ];
+ testHaskellDepends = [ base deepseq process ];
+ description = "Automatic testing of Haskell programs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"QuickCheck-GenT" = callPackage
({ mkDerivation, base, mtl, QuickCheck, random }:
mkDerivation {
@@ -17074,23 +17107,30 @@ self: {
"SciBaseTypes" = callPackage
({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable
- , lens, log-domain, mtl, QuickCheck, tasty, tasty-quickcheck
- , tasty-th, vector, vector-th-unbox
+ , lens, log-domain, mtl, QuickCheck, semirings, tasty
+ , tasty-quickcheck, tasty-th, vector, vector-th-unbox
}:
mkDerivation {
pname = "SciBaseTypes";
- version = "0.0.0.1";
- sha256 = "14xzlyca61jhfak1vjll5k2ac2hq55hfvbmqbpk8ls56amlyal5j";
+ version = "0.1.0.0";
+ sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr";
libraryHaskellDepends = [
aeson base binary cereal deepseq hashable lens log-domain mtl
- vector vector-th-unbox
+ semirings vector vector-th-unbox
];
testHaskellDepends = [
- base QuickCheck tasty tasty-quickcheck tasty-th
+ aeson base binary cereal deepseq hashable lens log-domain mtl
+ QuickCheck semirings tasty tasty-quickcheck tasty-th vector
+ vector-th-unbox
+ ];
+ benchmarkHaskellDepends = [
+ aeson base binary cereal deepseq hashable lens log-domain mtl
+ semirings vector vector-th-unbox
];
- benchmarkHaskellDepends = [ base ];
description = "Base types and classes for statistics, sciences and humanities";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"SciFlow" = callPackage
@@ -18553,6 +18593,24 @@ self: {
broken = true;
}) {};
+ "TaskMonad" = callPackage
+ ({ mkDerivation, base, containers, mtl, process, random, unix, X11
+ , X11-xft, xmonad, xmonad-contrib
+ }:
+ mkDerivation {
+ pname = "TaskMonad";
+ version = "1.0.1";
+ sha256 = "1kvhb0863kfbi63q0j9jzi3yr97r8zd5vhh5cqgpkra4rjb4qx1r";
+ revision = "1";
+ editedCabalFile = "1gsnl1sbnjh4j51mfniq6x2k9k6054frzxrdkqycmp0cpwhaijwi";
+ libraryHaskellDepends = [
+ base containers mtl process random unix X11 X11-xft xmonad
+ xmonad-contrib
+ ];
+ description = "A collection of tools which can be used to access taskwarrior from xmonad";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"Taxonomy" = callPackage
({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
, graphviz, parsec, text, vector
@@ -22553,6 +22611,26 @@ self: {
broken = true;
}) {};
+ "aern2-mp_0_1_4" = callPackage
+ ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
+ , mixed-types-num, QuickCheck, regex-tdfa, rounded
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "aern2-mp";
+ version = "0.1.4";
+ sha256 = "1q4ygvpxndvj0lsxb7aqw754nkxj1r2037f263g79vpjczkzzfwf";
+ libraryHaskellDepends = [
+ base convertible hspec integer-logarithms lens mixed-types-num
+ QuickCheck regex-tdfa rounded template-haskell
+ ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ description = "Multi-precision ball (interval) arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"aern2-real" = callPackage
({ mkDerivation, aern2-mp, aeson, base, bytestring, containers
, convertible, hspec, lens, mixed-types-num, QuickCheck, random
@@ -22560,8 +22638,8 @@ self: {
}:
mkDerivation {
pname = "aern2-real";
- version = "0.1.1.0";
- sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15";
+ version = "0.1.2";
+ sha256 = "1br2glj89xcm3iyb32yi1xwgzkva9mmvl9gih38kgg4ldidflvn8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -22714,6 +22792,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "aeson-casing_0_2_0_0" = callPackage
+ ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck
+ , tasty-th
+ }:
+ mkDerivation {
+ pname = "aeson-casing";
+ version = "0.2.0.0";
+ sha256 = "0cwjy46ac7vzdvkw6cm5xcbcljf2a4lcvc2xbsh8iwd3fdb0f8rp";
+ libraryHaskellDepends = [ aeson base ];
+ testHaskellDepends = [
+ aeson base tasty tasty-hunit tasty-quickcheck tasty-th
+ ];
+ description = "Tools to change the formatting of field names in Aeson instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-coerce" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, text }:
mkDerivation {
@@ -22922,13 +23017,13 @@ self: {
}) {};
"aeson-gadt-th" = callPackage
- ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit
- , template-haskell, transformers
+ ({ mkDerivation, aeson, aeson-qq, base, dependent-sum, hspec, HUnit
+ , markdown-unlit, template-haskell, transformers
}:
mkDerivation {
pname = "aeson-gadt-th";
- version = "0.1.2.1";
- sha256 = "0i5ld955dw6i5sf1j4cby6xfqf29r9gy1r6lh4901m6xcgh812jv";
+ version = "0.2.0.0";
+ sha256 = "111bx44s451qmnk70bvmf4f1z3wmi2pnwxqmmarvaz8zl4sw91c5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -22936,6 +23031,9 @@ self: {
];
executableHaskellDepends = [ aeson base dependent-sum ];
executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [
+ aeson aeson-qq base dependent-sum hspec HUnit
+ ];
description = "Derivation of Aeson instances for GADTs";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -27433,8 +27531,8 @@ self: {
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.3.4.0";
- sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84";
+ version = "0.3.6.0";
+ sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -28184,14 +28282,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-athena_6_4_0" = callPackage
+ "antiope-athena_7_0_0" = callPackage
({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base
, lens, resourcet, text, unliftio-core
}:
mkDerivation {
pname = "antiope-athena";
- version = "6.4.0";
- sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk";
+ version = "7.0.0";
+ sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -28200,6 +28298,7 @@ self: {
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28208,11 +28307,12 @@ self: {
({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
mkDerivation {
pname = "antiope-contract";
- version = "6.4.0";
- sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd";
+ version = "7.0.0";
+ sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb";
libraryHaskellDepends = [
aeson antiope-s3 avro base bytestring text
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -28240,25 +28340,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-core_6_4_0" = callPackage
- ({ mkDerivation, amazonka, amazonka-core, base, bytestring
- , exceptions, generic-lens, http-client, http-types, lens
- , monad-logger, mtl, resourcet, text, transformers, unliftio-core
+ "antiope-core_7_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
+ , bytestring, exceptions, generic-lens, hedgehog, hspec
+ , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
+ , scientific, text, transformers, unliftio-core
}:
mkDerivation {
pname = "antiope-core";
- version = "6.4.0";
- sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss";
+ version = "7.0.0";
+ sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr";
libraryHaskellDepends = [
- amazonka amazonka-core base bytestring exceptions generic-lens
- http-client http-types lens monad-logger mtl resourcet text
+ aeson amazonka amazonka-core base bytestring exceptions
+ generic-lens http-client http-types lens mtl resourcet text
transformers unliftio-core
];
testHaskellDepends = [
- amazonka amazonka-core base bytestring exceptions generic-lens
- http-client http-types lens monad-logger mtl resourcet text
- transformers unliftio-core
+ aeson aeson-lens amazonka amazonka-core base bytestring exceptions
+ generic-lens hedgehog hspec http-client http-types
+ hw-hspec-hedgehog lens mtl resourcet scientific text transformers
+ unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28283,15 +28386,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-dynamodb_6_4_0" = callPackage
+ "antiope-dynamodb_7_0_0" = callPackage
({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb
, antiope-core, base, generic-lens, lens, text, unliftio-core
, unordered-containers
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "6.4.0";
- sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai";
+ version = "7.0.0";
+ sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -28300,6 +28403,7 @@ self: {
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28328,25 +28432,26 @@ self: {
broken = true;
}) {};
- "antiope-messages_6_4_0" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson
- , monad-loops, network-uri, text, unliftio-core
+ "antiope-messages_7_0_0" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
+ , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens
+ , lens-aeson, monad-loops, network-uri, scientific, text
+ , unliftio-core
}:
mkDerivation {
pname = "antiope-messages";
- version = "6.4.0";
- sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9";
+ version = "7.0.0";
+ sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma";
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
- base generic-lens lens lens-aeson monad-loops network-uri text
- unliftio-core
+ aeson amazonka amazonka-core base bytestring generic-lens lens
+ lens-aeson monad-loops network-uri text unliftio-core
];
testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
- base generic-lens lens lens-aeson monad-loops network-uri text
- unliftio-core
+ aeson amazonka amazonka-core base bytestring generic-lens hedgehog
+ hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri
+ scientific text unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -28379,29 +28484,30 @@ self: {
broken = true;
}) {};
- "antiope-s3_6_4_0" = callPackage
+ "antiope-s3_7_0_0" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , antiope-core, attoparsec, base, bytestring, conduit
- , conduit-extra, exceptions, generic-lens, hedgehog, hspec
- , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl
- , network-uri, resourcet, text, time, unliftio-core
+ , antiope-core, antiope-messages, attoparsec, base, bytestring
+ , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
+ , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet
+ , text, time, unliftio-core
}:
mkDerivation {
pname = "antiope-s3";
- version = "6.4.0";
- sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2";
+ version = "7.0.0";
+ sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic";
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
- base bytestring conduit conduit-extra exceptions generic-lens
- http-types lens monad-logger mtl network-uri resourcet text time
- unliftio-core
+ aeson amazonka amazonka-core amazonka-s3 antiope-core
+ antiope-messages attoparsec base bytestring conduit conduit-extra
+ exceptions generic-lens http-types lens mtl network-uri resourcet
+ text time unliftio-core
];
testHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
base bytestring conduit conduit-extra exceptions generic-lens
- hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl
- network-uri resourcet text time unliftio-core
+ hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
+ resourcet text time unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -28426,22 +28532,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "antiope-sns_6_4_0" = callPackage
+ "antiope-sns_7_0_0" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
- , generic-lens, lens, text, time, unliftio-core
+ , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog
+ , lens, text, time, unliftio-core
}:
mkDerivation {
pname = "antiope-sns";
- version = "6.4.0";
- sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03";
+ version = "7.0.0";
+ sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh";
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sns base generic-lens lens
- text time unliftio-core
+ aeson amazonka amazonka-core amazonka-sns base bytestring
+ generic-lens lens text time unliftio-core
];
testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sns base generic-lens lens
- text time unliftio-core
+ aeson amazonka amazonka-core amazonka-sns base bytestring
+ generic-lens hedgehog hspec hw-hspec-hedgehog lens text time
+ unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28470,26 +28579,27 @@ self: {
broken = true;
}) {};
- "antiope-sqs_6_4_0" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , amazonka-sqs, antiope-messages, antiope-s3, base, conduit
- , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri
- , text, unliftio-core
+ "antiope-sqs_7_0_0" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
+ , bytestring, conduit, generic-lens, hedgehog, hspec
+ , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl
+ , network-uri, text, time, unliftio-core, unordered-containers
}:
mkDerivation {
pname = "antiope-sqs";
- version = "6.4.0";
- sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j";
+ version = "7.0.0";
+ sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07";
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
- antiope-messages antiope-s3 base conduit generic-lens lens
- lens-aeson monad-loops mtl network-uri text unliftio-core
+ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
+ generic-lens lens lens-aeson monad-loops mtl network-uri text
+ unliftio-core unordered-containers
];
testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
- antiope-messages antiope-s3 base conduit generic-lens lens
- lens-aeson monad-loops mtl network-uri text unliftio-core
+ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
+ generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson
+ monad-loops mtl network-uri text time unliftio-core
];
+ description = "Please see the README on Github at ";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -29520,6 +29630,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "approveapi" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, containers, deepseq, exceptions, hspec
+ , http-api-data, http-client, http-client-tls, http-media
+ , http-types, iso8601-time, katip, microlens, mtl, network
+ , QuickCheck, random, safe-exceptions, semigroups, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "approveapi";
+ version = "0.1.3.0";
+ sha256 = "1ylqv8vgz1nzndgms1rjn2fcqjymlx80xfyil0si2h0jxwxbwfr5";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring case-insensitive containers
+ deepseq exceptions http-api-data http-client http-client-tls
+ http-media http-types iso8601-time katip microlens mtl network
+ random safe-exceptions text time transformers unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+ semigroups text time transformers unordered-containers vector
+ ];
+ description = "ApproveAPI Haskell Client";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"approx-rand-test" = callPackage
({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit
, containers, data-default, data-default-class, filepath, HUnit
@@ -29644,17 +29783,17 @@ self: {
"arbor-datadog" = callPackage
({ mkDerivation, aeson, auto-update, base, buffer-builder
, bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network
- , random, resourcet, text, time, transformers, unordered-containers
- , vector
+ , optparse-applicative, random, resourcet, text, time, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "arbor-datadog";
- version = "0.0.0.1";
- sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv";
+ version = "0.1.0.0";
+ sha256 = "1w7bg8vj10mplfq39klhivj8hfb2cbgw9vhj1h64gm9v2xw25wlq";
libraryHaskellDepends = [
aeson auto-update base buffer-builder bytestring dlist generic-lens
- lens mtl network random resourcet text time transformers
- unordered-containers vector
+ lens mtl network optparse-applicative random resourcet text time
+ transformers unordered-containers vector
];
testHaskellDepends = [
base Cabal generic-lens hspec lens network resourcet time
@@ -29700,16 +29839,16 @@ self: {
"arbor-monad-logger" = callPackage
({ mkDerivation, base, bytestring, fast-logger, hedgehog, hspec
- , hw-hspec-hedgehog, monad-logger, mtl, text
+ , hw-hspec-hedgehog, monad-logger, mtl, optparse-applicative, text
}:
mkDerivation {
pname = "arbor-monad-logger";
- version = "0.1.0.0";
- sha256 = "0m6gi36ckaq4v5mzpp6abcq93hyvvr0f7fdh4v87c4n044757agn";
+ version = "0.1.1.1";
+ sha256 = "13lgpr2j2vq2d4mbxl72h86iw5n028m5q0n2hbiz4hgk2yn2f2hs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring fast-logger monad-logger text
+ base bytestring fast-logger monad-logger optparse-applicative text
];
executableHaskellDepends = [ base mtl ];
testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
@@ -29749,10 +29888,8 @@ self: {
}:
mkDerivation {
pname = "arbor-monad-metric-datadog";
- version = "1.0.0";
- sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc";
- revision = "2";
- editedCabalFile = "0x8dp7xh1rpd9db2kiya8sr9nc7wzka256jxsvxqfmphd08yc4ad";
+ version = "1.1.0";
+ sha256 = "1ly7vn630vm256jg1b6h39vzd7zv658h7j4vfv4jkdrrcl3jmbr0";
libraryHaskellDepends = [
arbor-datadog arbor-monad-metric base bytestring containers
generic-lens lens mtl network resourcet stm text transformers
@@ -30214,8 +30351,8 @@ self: {
pname = "arithmoi";
version = "0.8.0.0";
sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
- revision = "2";
- editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9";
+ revision = "3";
+ editedCabalFile = "1cn6axcdiahaqnq1rsm0snr78lrypay6cxh3yxw3vrrwilavri1i";
configureFlags = [ "-f-llvm" ];
libraryHaskellDepends = [
array base containers deepseq exact-pi ghc-prim integer-gmp
@@ -30588,6 +30725,22 @@ self: {
license = "LGPL";
}) {};
+ "asap" = callPackage
+ ({ mkDerivation, base, bytestring, hedgehog, jwt, lens, mtl
+ , semigroups, text, time, uuid
+ }:
+ mkDerivation {
+ pname = "asap";
+ version = "0.0.4";
+ sha256 = "08yfangqxmdh2w39fqnicn16jnb1x9f263f99253khx3sv4q7qrf";
+ libraryHaskellDepends = [
+ base bytestring jwt lens mtl semigroups text time uuid
+ ];
+ testHaskellDepends = [ base hedgehog jwt mtl text time ];
+ description = "Atlassian Service Authentication Protocol";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"ascetic" = callPackage
({ mkDerivation, base, MissingH }:
mkDerivation {
@@ -30845,37 +30998,37 @@ self: {
broken = true;
}) {};
- "asif_4_1_0" = callPackage
+ "asif_5_0_2" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, conduit
, conduit-combinators, conduit-extra, containers, cpu, directory
, either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits
- , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale
+ , hw-hspec-hedgehog, hw-ip, lens, network, old-locale
, optparse-applicative, profunctors, resourcet, temporary-resourcet
, text, thyme, transformers, vector
}:
mkDerivation {
pname = "asif";
- version = "4.1.0";
- sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3";
+ version = "5.0.2";
+ sha256 = "19wsjpk3jnij6b4ap84g5jaka734za2381yz4x5ahm4f1nvc6gdf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base binary bytestring conduit conduit-combinators
conduit-extra containers cpu either exceptions foldl generic-lens
- hw-bits hw-ip iproute lens network old-locale profunctors resourcet
+ hw-bits hw-ip lens network old-locale profunctors resourcet
temporary-resourcet text thyme transformers vector
];
executableHaskellDepends = [
attoparsec base binary bytestring conduit conduit-combinators
conduit-extra containers cpu directory either exceptions foldl
- generic-lens hw-bits hw-ip iproute lens network old-locale
+ generic-lens hw-bits hw-ip lens network old-locale
optparse-applicative profunctors resourcet temporary-resourcet text
thyme transformers vector
];
testHaskellDepends = [
attoparsec base binary bytestring conduit conduit-combinators
conduit-extra containers cpu either exceptions foldl generic-lens
- hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network
+ hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network
old-locale profunctors resourcet temporary-resourcet text thyme
transformers vector
];
@@ -31914,24 +32067,24 @@ self: {
"ats-pkg" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
, Cabal, cli-setup, composition-prelude, containers, cpphs
- , dependency, dhall, directory, file-embed, filepath, http-client
- , http-client-tls, libarchive, lzma, microlens, mtl
+ , 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, temporary, text, unix, zip-archive, zlib
+ , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.5.3";
- sha256 = "0imd4xikj15cb066713c38ik7a5r4dgdw95wgynjpi39clv4rmbz";
+ version = "3.2.5.12";
+ sha256 = "174nxhkfb1qvlfxjifrb1pqfrh4na64wvfrnblzpfp03di0hbh3m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring bzlib Cabal
composition-prelude containers dependency dhall directory
- file-embed filepath http-client http-client-tls libarchive lzma
+ file-embed filemanip filepath http-client http-client-tls lzma
microlens mtl parallel-io process shake shake-ats shake-c shake-ext
- text unix zip-archive zlib
+ tar text unix zip-archive zlib
];
libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
@@ -33583,19 +33736,19 @@ self: {
"aws-lambda-haskell-runtime" = callPackage
({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
- , directory, filepath, hspec, microlens-platform, mtl
+ , directory, filepath, hspec, http-client, microlens-platform, mtl
, optparse-generic, process, template-haskell, text, uuid, wreq
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime";
- version = "1.0.9";
- sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3";
+ version = "1.0.10";
+ sha256 = "09rd4jfw59j003q14y76isdb5dg23r0vxqkg8jqf49c9gap7wqsq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring case-insensitive conduit directory filepath
- microlens-platform mtl optparse-generic process template-haskell
- text uuid wreq
+ http-client microlens-platform mtl optparse-generic process
+ template-haskell text uuid wreq
];
executableHaskellDepends = [ base mtl ];
testHaskellDepends = [ base hspec mtl ];
@@ -34089,8 +34242,8 @@ self: {
}:
mkDerivation {
pname = "b9";
- version = "0.5.68";
- sha256 = "13v843lma4yrlcsx60ils1j0h8q4aj6p09phqrfc0r1zc25a5ssv";
+ version = "0.5.68.2";
+ sha256 = "1frinivjzyyjn9w3xqyr659wrjniv5598frdf9526g7ab484di8w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -34527,6 +34680,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "barbies_1_1_2_1" = callPackage
+ ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "barbies";
+ version = "1.1.2.1";
+ sha256 = "0svcdjs03i4ryhg3qzrp3l7ck0ilgnhxwc2h69qnzknqjklz7p1y";
+ libraryHaskellDepends = [ base bifunctors ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Classes for working with types that can change clothes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"barchart" = callPackage
({ mkDerivation, base, cmdargs, csv, diagrams, filepath }:
mkDerivation {
@@ -34782,6 +34952,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "base-orphans_0_8_1" = callPackage
+ ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
+ }:
+ mkDerivation {
+ pname = "base-orphans";
+ version = "0.8.1";
+ sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4";
+ libraryHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ testToolDepends = [ hspec-discover ];
+ description = "Backwards-compatible orphan instances for base";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base-prelude" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -34939,6 +35124,29 @@ self: {
broken = true;
}) {};
+ "base64-bytestring-type_1_0_1" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+ , binary, bytestring, cereal, deepseq, hashable, http-api-data
+ , QuickCheck, serialise, tasty, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "base64-bytestring-type";
+ version = "1.0.1";
+ sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
+ libraryHaskellDepends = [
+ aeson base base-compat base64-bytestring binary bytestring cereal
+ deepseq hashable http-api-data QuickCheck serialise text
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring cereal http-api-data serialise tasty
+ tasty-quickcheck
+ ];
+ description = "A newtype around ByteString, for base64 encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"base64-conduit" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, conduit
, hspec, QuickCheck, transformers
@@ -35568,16 +35776,17 @@ self: {
"beam-core" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, dlist, free
- , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty
- , tasty-hunit, text, time, vector-sized
+ , ghc-prim, hashable, microlens, mtl, network-uri, scientific
+ , tagged, tasty, tasty-hunit, text, time, vector, vector-sized
}:
mkDerivation {
pname = "beam-core";
- version = "0.7.2.3";
- sha256 = "1pas3hjj8x4yzwwqazydnvv59rjmddy70g6iip6fgm7sg4114rkh";
+ version = "0.8.0.0";
+ sha256 = "1l71xvmny0nf6fdhsffvfj764h4d97icgc291kfqz25n511b74r8";
libraryHaskellDepends = [
aeson base bytestring containers dlist free ghc-prim hashable
- microlens mtl network-uri tagged text time vector-sized
+ microlens mtl network-uri scientific tagged text time vector
+ vector-sized
];
testHaskellDepends = [
base bytestring tasty tasty-hunit text time
@@ -35591,18 +35800,18 @@ self: {
"beam-migrate" = callPackage
({ mkDerivation, aeson, base, beam-core, bytestring, containers
, deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
- , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
- , time, unordered-containers, uuid-types, vector
+ , haskell-src-exts, microlens, mtl, parallel, pqueue, pretty
+ , scientific, text, time, unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "beam-migrate";
- version = "0.3.2.2";
- sha256 = "15vkxj93c3zhraj94v8n9sgkjlm6idawbzxqqgcx05yhy0dyh0c9";
+ version = "0.4.0.1";
+ sha256 = "12c5yibargwrw9z806bik7rly9njq0qa60gsqlh8pbzaaji5fknf";
libraryHaskellDepends = [
aeson base beam-core bytestring containers deepseq dependent-map
- dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
- pqueue pretty scientific text time unordered-containers uuid-types
- vector
+ dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl
+ parallel pqueue pretty scientific text time unordered-containers
+ uuid-types vector
];
description = "SQL DDL support and migrations support library for Beam";
license = stdenv.lib.licenses.mit;
@@ -35610,6 +35819,25 @@ self: {
broken = true;
}) {};
+ "beam-mysql" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, beam-core, bytestring
+ , case-insensitive, free, hashable, mtl, mysql, network-uri
+ , scientific, text, time
+ }:
+ mkDerivation {
+ pname = "beam-mysql";
+ version = "0.2.0.0";
+ sha256 = "14h0cfzzfbdh18impfvlz3ba3ycig5g7adv17h2ag1x6yyx5h259";
+ libraryHaskellDepends = [
+ aeson attoparsec base beam-core bytestring case-insensitive free
+ hashable mtl mysql network-uri scientific text time
+ ];
+ description = "Connection layer between beam and MySQL/MariaDB";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"beam-newtype-field" = callPackage
({ mkDerivation, base, beam-core, beam-migrate, lens
, postgresql-simple
@@ -35628,21 +35856,26 @@ self: {
}) {};
"beam-postgres" = callPackage
- ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring
- , case-insensitive, conduit, free, hashable, haskell-src-exts
- , lifted-base, monad-control, mtl, network-uri, postgresql-libpq
- , postgresql-simple, scientific, tagged, text, time
- , unordered-containers, uuid-types, vector
+ ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
+ , bytestring, case-insensitive, conduit, directory, filepath, free
+ , hashable, haskell-src-exts, hedgehog, lifted-base, monad-control
+ , mtl, network-uri, postgresql-libpq, postgresql-simple, process
+ , scientific, tagged, tasty, tasty-hunit, temporary, text, time
+ , unordered-containers, uuid, uuid-types, vector
}:
mkDerivation {
pname = "beam-postgres";
- version = "0.3.2.3";
- sha256 = "17aplr20rclah3wk7b978zgn55fp61s8x7a5qf449nvfs97cs00b";
+ version = "0.4.0.0";
+ sha256 = "0dxnp6zsyy30vrlv15iw4qwyzwawg468zqqsjnzk9h3g9k9xzj3v";
libraryHaskellDepends = [
- aeson base beam-core beam-migrate bytestring case-insensitive
- conduit free hashable haskell-src-exts lifted-base monad-control
- mtl network-uri postgresql-libpq postgresql-simple scientific
- tagged text time unordered-containers uuid-types vector
+ aeson attoparsec base beam-core beam-migrate bytestring
+ case-insensitive conduit free hashable haskell-src-exts lifted-base
+ monad-control mtl network-uri postgresql-libpq postgresql-simple
+ scientific tagged text time unordered-containers uuid-types vector
+ ];
+ testHaskellDepends = [
+ base beam-core beam-migrate bytestring directory filepath hedgehog
+ postgresql-simple process tasty tasty-hunit temporary text uuid
];
description = "Connection layer between beam and postgres";
license = stdenv.lib.licenses.mit;
@@ -35657,8 +35890,8 @@ self: {
}:
mkDerivation {
pname = "beam-sqlite";
- version = "0.3.2.4";
- sha256 = "14s1s7i9l95nbz4nis3fc4zh8cln6vj2p4y5bk235l088i4z6qfj";
+ version = "0.4.0.0";
+ sha256 = "09va580nv05xavcrqw9drh86xgqgzl98bvh707xjn1d6wh3miizw";
libraryHaskellDepends = [
aeson attoparsec base beam-core beam-migrate bytestring dlist free
hashable mtl network-uri scientific sqlite-simple text time unix
@@ -38140,30 +38373,30 @@ self: {
}) {};
"bioinformatics-toolkit" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, bytestring-lexing, case-insensitive, clustering, conduit
- , conduit-combinators, containers, criterion, data-default-class
- , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
- , IntervalMap, lens, math-functions, matrices, mtl, parallel
- , primitive, random, split, statistics, tasty, tasty-golden
- , tasty-hunit, text, transformers, unordered-containers, vector
- , vector-algorithms, word8
+ , conduit-combinators, conduit-extra, containers, criterion
+ , data-default-class, data-ordlist, double-conversion, hexpat
+ , HsHTSLib, http-conduit, IntervalMap, lens, math-functions
+ , matrices, mtl, parallel, primitive, random, split, statistics
+ , tasty, tasty-golden, tasty-hunit, text, transformers
+ , unordered-containers, vector, vector-algorithms, word8
}:
mkDerivation {
pname = "bioinformatics-toolkit";
- version = "0.5.1";
- sha256 = "1lpcbzapinfbd7s4hz2yj3nwp1hm4fy514hqnqil4ijndyknlk3n";
+ version = "0.6.0";
+ sha256 = "1w6c8gi8vss8wz94hwv5vap2ss6qzm7la9p9dxplcw7yz3q5c47w";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring bytestring-lexing
- case-insensitive clustering conduit containers data-default-class
- data-ordlist double-conversion hexpat HsHTSLib http-conduit
- IntervalMap lens math-functions matrices mtl parallel primitive
- split statistics text transformers unordered-containers vector
- vector-algorithms word8
+ aeson aeson-pretty attoparsec base bytestring bytestring-lexing
+ case-insensitive clustering conduit conduit-extra containers
+ data-default-class data-ordlist double-conversion hexpat HsHTSLib
+ http-conduit IntervalMap lens math-functions matrices mtl parallel
+ primitive split statistics text transformers unordered-containers
+ vector vector-algorithms word8
];
testHaskellDepends = [
- base bytestring conduit conduit-combinators data-default-class
+ base bytestring conduit conduit-combinators data-default-class lens
matrices mtl random tasty tasty-golden tasty-hunit
unordered-containers vector
];
@@ -38313,17 +38546,18 @@ self: {
}) {};
"bisc" = callPackage
- ({ mkDerivation, base, directory, filepath, selda, selda-sqlite
- , text, xdg-basedir
+ ({ mkDerivation, base, configurator, directory, filepath, mtl
+ , selda, selda-sqlite, text, xdg-basedir
}:
mkDerivation {
pname = "bisc";
- version = "0.1.0.0";
- sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0";
+ version = "0.2.0.0";
+ sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base directory filepath selda selda-sqlite text xdg-basedir
+ base configurator directory filepath mtl selda selda-sqlite text
+ xdg-basedir
];
description = "A small tool that clears qutebrowser cookies";
license = stdenv.lib.licenses.gpl3;
@@ -41181,8 +41415,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.46";
- sha256 = "1alfv1z0adp74d7vcqp92c73y8rkhv96s3lj4dqjxkqk044zgd9p";
+ version = "0.47";
+ sha256 = "1glj71qajc2rdn9akhhh0yryhps57s33x0i2fb4mf12zg8pp5kj7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41453,10 +41687,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan";
- version = "0.2.0.1";
- sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf";
- revision = "2";
- editedCabalFile = "1vvs1m5n6lflmp8hdxksxa4ibllfx609y791wg21lvyz5m208hp9";
+ version = "0.2.0.2";
+ sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv";
libraryHaskellDepends = [ base unliftio-core ];
benchmarkHaskellDepends = [ async base criterion deepseq stm ];
description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
@@ -41471,8 +41703,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-conduit";
- version = "0.2.0.1";
- sha256 = "0q3kikryj38macxnwmlk6xijcmvxys0acryj419n7749n7bpc59s";
+ version = "0.2.0.2";
+ sha256 = "1xnf1ibgnzi4xbmfgrkkfg3pkig7v8vv0xpfhhcdmnybwm2yhlli";
libraryHaskellDepends = [
base broadcast-chan conduit resourcet transformers unliftio-core
];
@@ -41491,8 +41723,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-pipes";
- version = "0.2.0.1";
- sha256 = "0m2g14rlqladhwfvphmnpsddlbc5bhsjdsb4a9r475vkib30gdp2";
+ version = "0.2.0.2";
+ sha256 = "1brr0vjrsd53qji8pmns003m3k1s28hvr2w8875hv2fznmm8x1g7";
libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];
testHaskellDepends = [
base broadcast-chan-tests containers foldl pipes pipes-safe
@@ -41511,8 +41743,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-tests";
- version = "0.2.0.1";
- sha256 = "1l3zqc693jmvxmb5lln6fmwn01rjpwhvlllkrn3v6hs2bwibrp5n";
+ version = "0.2.0.2";
+ sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym";
libraryHaskellDepends = [
async base broadcast-chan clock containers optparse-applicative
paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -42510,18 +42742,18 @@ self: {
"bv-sized" = callPackage
({ mkDerivation, base, containers, lens, mtl, parameterized-utils
- , prettyclass, QuickCheck, random
+ , pretty, QuickCheck, random
}:
mkDerivation {
pname = "bv-sized";
- version = "0.5.0";
- sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6";
+ version = "0.6.0";
+ sha256 = "0bhci00l4946z3b6ynzpi3k17bnawir88kqpp36jai8filb0znc5";
libraryHaskellDepends = [
- base containers lens mtl parameterized-utils prettyclass QuickCheck
+ base containers lens mtl parameterized-utils pretty QuickCheck
random
];
testHaskellDepends = [
- base lens parameterized-utils prettyclass QuickCheck random
+ base lens parameterized-utils pretty QuickCheck random
];
description = "a BitVector datatype that is parameterized by the vector width";
license = stdenv.lib.licenses.bsd3;
@@ -43790,8 +44022,8 @@ self: {
pname = "cabal-install";
version = "2.4.1.0";
sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
- revision = "1";
- editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p";
+ revision = "2";
+ editedCabalFile = "18llmvfaf8gcz2dvhhs3j0a6kzzisajh1bms7wwnrl0hi4xyx012";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath process ];
@@ -45423,8 +45655,8 @@ self: {
}:
mkDerivation {
pname = "capability";
- version = "0.1.0.0";
- sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51";
+ version = "0.2.0.0";
+ sha256 = "0jssnbqrhkkfkjzya8qprk89r8vqzzy45sm9bwhw2rwx8mrbn40q";
libraryHaskellDepends = [
base dlist exceptions generic-lens lens monad-control monad-unlift
mtl mutable-containers primitive safe-exceptions streaming
@@ -47959,8 +48191,8 @@ self: {
({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
mkDerivation {
pname = "checkers";
- version = "0.4.11";
- sha256 = "0f1dhiymdihrnpz9h9p4mi8iica07qv3wm47acvdkhxrc4sjsq6h";
+ version = "0.4.14";
+ sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz";
libraryHaskellDepends = [
array base QuickCheck random semigroupoids
];
@@ -47968,6 +48200,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "checkers_0_5_0" = callPackage
+ ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
+ mkDerivation {
+ pname = "checkers";
+ version = "0.5.0";
+ sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7";
+ libraryHaskellDepends = [
+ array base QuickCheck random semigroupoids
+ ];
+ description = "Check properties on standard classes and data structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"checkmate" = callPackage
({ mkDerivation, base, bytestring, containers, diff-parse
, directory, file-embed, filepath, github, hlint, hspec
@@ -48049,6 +48295,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "chessIO" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, directory, haskeline
+ , megaparsec, mtl, parallel, parser-combinators, process, split
+ , stm, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "chessIO";
+ version = "0.1.0.0";
+ sha256 = "1rxna3jy50fddw33cjg603gdcmq89qr21q8syz60lm8rri0rg6bh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring megaparsec parser-combinators process
+ stm unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ attoparsec base bytestring haskeline megaparsec mtl
+ parser-combinators process split stm unordered-containers vector
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring directory megaparsec parallel
+ parser-combinators process stm time unordered-containers vector
+ ];
+ description = "Basic chess move generation and UCI client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"chesshs" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, containers }:
mkDerivation {
@@ -48936,6 +49211,34 @@ self: {
broken = true;
}) {};
+ "circuit-breaker" = callPackage
+ ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances
+ , random, tasty, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ }:
+ mkDerivation {
+ pname = "circuit-breaker";
+ version = "0.1.0.0";
+ sha256 = "1yg6d0676z94070rwqzf13bpg1qzqyh5wk38yqcp7w1aib304mw7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base mtl random text time transformers unliftio unliftio-core
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ base mtl random text time transformers unliftio unliftio-core
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck quickcheck-instances random tasty tasty-hunit
+ tasty-quickcheck text time transformers unliftio unliftio-core
+ unordered-containers
+ ];
+ description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cirru-parser" = callPackage
({ mkDerivation, aeson, base, text, vector }:
mkDerivation {
@@ -49269,8 +49572,8 @@ self: {
}:
mkDerivation {
pname = "clang-pure";
- version = "0.2.0.3";
- sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n";
+ version = "0.2.0.4";
+ sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal inline-c process ];
@@ -50100,8 +50403,8 @@ self: {
}:
mkDerivation {
pname = "cli-setup";
- version = "0.2.0.6";
- sha256 = "10w251gvlyqvzg2ffs2mdfkd6lla8v0zkaibpnbaz5iy1cajr65z";
+ version = "0.2.0.7";
+ sha256 = "1fp1m48rpgnq3db4nvcnry3h46m7k07g8blivv0mb62w8fdm9smq";
libraryHaskellDepends = [
base bytestring directory file-embed process
];
@@ -51087,19 +51390,19 @@ self: {
}) {cmph = null;};
"cmt" = callPackage
- ({ mkDerivation, attoparsec, base, classy-prelude, directory
- , file-embed, filepath, process, tasty, tasty-discover
+ ({ mkDerivation, attoparsec, base, classy-prelude, containers
+ , directory, file-embed, filepath, process, tasty, tasty-discover
, tasty-expected-failure, tasty-hunit, terminal-size, text
}:
mkDerivation {
pname = "cmt";
- version = "0.4.0.0";
- sha256 = "17faw3g078i2a15zl1d31wd0ag3hk347hf23widdkcnf6bs4qmr6";
+ version = "0.5.0.0";
+ sha256 = "0wnnqzcqxk976q0zy35gi9l46w2fdjvqnx2nxijmfsxj3f221ggx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base classy-prelude directory filepath process
- terminal-size text
+ attoparsec base classy-prelude containers directory filepath
+ process terminal-size text
];
executableHaskellDepends = [ base classy-prelude ];
testHaskellDepends = [
@@ -51510,6 +51813,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "coerce-role" = callPackage
+ ({ mkDerivation, base, unliftio }:
+ mkDerivation {
+ pname = "coerce-role";
+ version = "0.1.0.0";
+ sha256 = "1qllw5wrpk328n2kjxbry3w85fwwkrdxd3cgl3z160ij200mxcyp";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base unliftio ];
+ description = "Having trouble deriving instances because of type roles? Solve it here!";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"coerce-util" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -53224,8 +53539,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "2.0.2.1";
- sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi";
+ version = "2.0.4.0";
+ sha256 = "1siz9jbwp33i32qwqyyz4yydbmsg35jfw7x7c82arpy401kmk1hk";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
@@ -53697,6 +54012,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "concurrency_1_7_0_0" = callPackage
+ ({ mkDerivation, array, atomic-primops, base, exceptions
+ , monad-control, mtl, stm, transformers
+ }:
+ mkDerivation {
+ pname = "concurrency";
+ version = "1.7.0.0";
+ sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06";
+ libraryHaskellDepends = [
+ array atomic-primops base exceptions monad-control mtl stm
+ transformers
+ ];
+ description = "Typeclasses, functions, and data types for concurrency and STM";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"concurrency-benchmarks" = callPackage
({ mkDerivation, async, base, bench-graph, bytestring, Chart
, Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -55105,8 +55437,8 @@ self: {
}:
mkDerivation {
pname = "console-program";
- version = "0.4.2.2";
- sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja";
+ version = "0.4.2.3";
+ sha256 = "165ay133dxr0midy8yhsnsw5pf1lqh6pg4x63gjip945hfjl0lwq";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers directory haskeline
parsec parsec-extra split transformers unix utility-ht
@@ -55321,8 +55653,8 @@ self: {
}:
mkDerivation {
pname = "constraints-deriving";
- version = "1.0.0.0";
- sha256 = "0a1r5pd1npfahx8hpr5kzw9xvla7f4d6463j80ar35vz854llxhm";
+ version = "1.0.1.0";
+ sha256 = "0jsqm1d8341i98vg98l01sg0vhw398z1x3lf68kz380qiy7paz4c";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal ];
@@ -55360,8 +55692,8 @@ self: {
}:
mkDerivation {
pname = "constraints-extras";
- version = "0.2.3.3";
- sha256 = "1399jah0lh127z56wv0h2c94s26fanw58x0x8imakjlj2dlg8km1";
+ version = "0.2.3.4";
+ sha256 = "1xkivpkjgnnrs5fyg0g77f84zh3sxqgxif0l2rhcq1wdad709q55";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base constraints template-haskell ];
@@ -55659,8 +55991,8 @@ self: {
({ mkDerivation, base, deepseq, primitive }:
mkDerivation {
pname = "contiguous";
- version = "0.3.2.0";
- sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7";
+ version = "0.3.3.0";
+ sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc";
libraryHaskellDepends = [ base deepseq primitive ];
description = "Unified interface for primitive arrays";
license = stdenv.lib.licenses.bsd3;
@@ -56309,23 +56641,17 @@ self: {
}) {};
"copilot" = callPackage
- ({ mkDerivation, base, copilot-c99, copilot-cbmc, copilot-core
- , copilot-language, copilot-libraries, copilot-sbv, copilot-theorem
- , directory, random
+ ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language
+ , copilot-libraries, copilot-theorem, directory, filepath
+ , optparse-applicative
}:
mkDerivation {
pname = "copilot";
- version = "2.2.1";
- sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9";
- isLibrary = true;
- isExecutable = true;
+ version = "3.0";
+ sha256 = "0i28vqzg7pgff0y8ill8zj8qbf1vqk3yfscvhrv5mcywp2fm6f31";
libraryHaskellDepends = [
- base copilot-c99 copilot-cbmc copilot-core copilot-language
- copilot-libraries copilot-sbv copilot-theorem
- ];
- executableHaskellDepends = [
- base copilot-c99 copilot-cbmc copilot-core copilot-language
- copilot-libraries copilot-sbv copilot-theorem directory random
+ base copilot-c99 copilot-core copilot-language copilot-libraries
+ copilot-theorem directory filepath optparse-applicative
];
description = "A stream DSL for writing embedded C programs";
license = stdenv.lib.licenses.bsd3;
@@ -56334,22 +56660,17 @@ self: {
}) {};
"copilot-c99" = callPackage
- ({ mkDerivation, atom, base, bytestring, containers, copilot-core
- , csv, directory, pretty, process, QuickCheck, random, text, vector
+ ({ mkDerivation, base, containers, copilot-core, directory
+ , filepath, language-c99, language-c99-simple, language-c99-util
+ , mtl, pretty
}:
mkDerivation {
pname = "copilot-c99";
- version = "2.2.1";
- sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq";
- isLibrary = true;
- isExecutable = true;
+ version = "3.0";
+ sha256 = "11v8py8hgp76dlp2n3nw4gqw4s0jnq51vd26y8vi5k71jiwwp0k9";
libraryHaskellDepends = [
- atom base bytestring containers copilot-core csv directory pretty
- process QuickCheck random text vector
- ];
- executableHaskellDepends = [
- atom base bytestring containers copilot-core csv directory pretty
- process QuickCheck random text vector
+ base containers copilot-core directory filepath language-c99
+ language-c99-simple language-c99-util mtl pretty
];
description = "A compiler for Copilot targeting C99";
license = stdenv.lib.licenses.bsd3;
@@ -56376,15 +56697,13 @@ self: {
}) {};
"copilot-core" = callPackage
- ({ mkDerivation, base, containers, dlist, mtl, pretty, pretty-ncols
- , random
- }:
+ ({ mkDerivation, base, containers, dlist, mtl, pretty, random }:
mkDerivation {
pname = "copilot-core";
- version = "2.2.1";
- sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105";
+ version = "3.0";
+ sha256 = "0n6vczrc56hlgkya53apg0g64mvm648xhqqi174gxs45zlb23n9y";
libraryHaskellDepends = [
- base containers dlist mtl pretty pretty-ncols random
+ base containers dlist mtl pretty random
];
description = "An intermediate representation for Copilot";
license = stdenv.lib.licenses.bsd3;
@@ -56398,8 +56717,8 @@ self: {
}:
mkDerivation {
pname = "copilot-language";
- version = "2.2.1";
- sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8";
+ version = "3.0";
+ sha256 = "094yfrg0szfmskznznlsiqi8ms6pbny7agc2w2qvsmlxn6rdhsk9";
libraryHaskellDepends = [
array base containers copilot-core copilot-theorem data-reify
ghc-prim mtl
@@ -56411,15 +56730,15 @@ self: {
}) {};
"copilot-libraries" = callPackage
- ({ mkDerivation, array, base, containers, copilot-language, mtl
- , parsec
+ ({ mkDerivation, array, base, containers, copilot-language
+ , data-reify, mtl, parsec
}:
mkDerivation {
pname = "copilot-libraries";
- version = "2.2.1";
- sha256 = "0ashnay40kkbysnbz8ay0r7ljzwkx07m4z960kfjnh3y6s5qk6ww";
+ version = "3.0";
+ sha256 = "0xrv37m770qnc722iv5x67kjic11q2sd1bcx2b0gr93p54frbjs4";
libraryHaskellDepends = [
- array base containers copilot-language mtl parsec
+ array base containers copilot-language data-reify mtl parsec
];
description = "Libraries for the Copilot language";
license = stdenv.lib.licenses.bsd3;
@@ -56447,15 +56766,15 @@ self: {
"copilot-theorem" = callPackage
({ mkDerivation, ansi-terminal, base, bimap, containers
, copilot-core, data-default, directory, mtl, parsec, pretty
- , process, random, smtlib2, transformers, xml
+ , process, random, transformers, xml
}:
mkDerivation {
pname = "copilot-theorem";
- version = "2.2.1";
- sha256 = "1qw46k26f6cisyjmjn0d9g7sjkx67vpydiqm7l9f1hib4dygcznx";
+ version = "3.0";
+ sha256 = "1h8gjlfhl473d6h8zafmqv3dzdhmgpyp8bsvysfzb7s2ga5hwnrq";
libraryHaskellDepends = [
ansi-terminal base bimap containers copilot-core data-default
- directory mtl parsec pretty process random smtlib2 transformers xml
+ directory mtl parsec pretty process random transformers xml
];
description = "k-induction for Copilot";
license = stdenv.lib.licenses.bsd3;
@@ -56968,10 +57287,8 @@ self: {
}:
mkDerivation {
pname = "cpkg";
- version = "0.1.1.0";
- sha256 = "1qmz4m9kbkmcb0i7iy1ay1hkkqh826v98lpqf0zpk7sin686xjv4";
- revision = "1";
- editedCabalFile = "004178xsld8mmy07z23x51vzbjrjprv17k8mq29vgibkm5kd1l5r";
+ version = "0.1.1.1";
+ sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -57100,8 +57417,8 @@ self: {
({ mkDerivation, base, containers, parallel }:
mkDerivation {
pname = "cpsa";
- version = "3.6.1";
- sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp";
+ version = "3.6.2";
+ sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -57241,6 +57558,8 @@ self: {
pname = "cql-io";
version = "1.1.0";
sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw";
+ revision = "1";
+ editedCabalFile = "0zxc28i4c26qi6xpgsyhn0f539ni6wv6c1pixh056bzm9pwp60d7";
libraryHaskellDepends = [
async auto-update base bytestring containers cql cryptonite
data-default-class exceptions hashable HsOpenSSL iproute lens mtl
@@ -58865,15 +59184,15 @@ self: {
"cryptostore" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, basement
, bytestring, cryptonite, hourglass, memory, pem, tasty
- , tasty-hunit, tasty-quickcheck, x509
+ , tasty-hunit, tasty-quickcheck, x509, x509-validation
}:
mkDerivation {
pname = "cryptostore";
- version = "0.1.0.0";
- sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz";
+ version = "0.2.0.0";
+ sha256 = "1j7pk42mivwlcrjyrjdkldidhsv3k5myqq0ld8sksgkbkn1k1z7w";
libraryHaskellDepends = [
asn1-encoding asn1-types base basement bytestring cryptonite
- hourglass memory pem x509
+ hourglass memory pem x509 x509-validation
];
testHaskellDepends = [
asn1-types base bytestring cryptonite hourglass memory pem tasty
@@ -58985,8 +59304,8 @@ self: {
}:
mkDerivation {
pname = "csound-catalog";
- version = "0.7.2";
- sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx";
+ version = "0.7.3";
+ sha256 = "18xn06drza3pwyhidlkr478hvn8ss93f3f30wmfrh79ngabip4kp";
libraryHaskellDepends = [
base csound-expression csound-sampler sharc-timbre transformers
];
@@ -59588,23 +59907,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "curl-cookiejar" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, conduit
+ , conduit-extra, http-client, time
+ }:
+ mkDerivation {
+ pname = "curl-cookiejar";
+ version = "0.1.0.0";
+ sha256 = "0fflf6p1qnr7h4dhpv8d1pm1whfphz1dva2yk6s2wk8dv6wbbdfj";
+ libraryHaskellDepends = [
+ attoparsec base bytestring conduit conduit-extra http-client time
+ ];
+ description = "Parsing and pretty-printing of cURL/wget cookie jars";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"curl-runnings" = callPackage
({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs
, connection, directory, hspec, hspec-expectations, http-client-tls
- , http-conduit, http-types, megaparsec, pretty-simple, regex-posix
- , tar, text, unordered-containers, vector, yaml, zlib
+ , http-conduit, megaparsec, pretty-simple, regex-posix, tar, text
+ , unordered-containers, vector, yaml, zlib
}:
mkDerivation {
pname = "curl-runnings";
- version = "0.10.0";
- sha256 = "11mzxsqiikwa0xjiiq4mk4r850zdp9q75x0qz5wrjq4ks4743wp3";
+ version = "0.11.0";
+ sha256 = "18vbb0k9gfi528za6wdw4m8997ks5s6vlwz4c9rjziq5ab0xdcfr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring case-insensitive connection directory hspec
- hspec-expectations http-client-tls http-conduit http-types
- megaparsec pretty-simple regex-posix text unordered-containers
- vector yaml
+ hspec-expectations http-client-tls http-conduit megaparsec
+ pretty-simple regex-posix text unordered-containers vector yaml
];
executableHaskellDepends = [
aeson base bytestring cmdargs directory http-conduit tar text zlib
@@ -62435,21 +62768,22 @@ self: {
"datadog-tracing" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, ffunctor
- , generic-random, hspec-golden-aeson, mtl, prettyprinter
- , QuickCheck, quickcheck-text, refined, servant, servant-client
- , servant-server, tasty, tasty-discover, tasty-hspec, text, time
- , warp
+ , generic-random, hspec-golden-aeson, http-media, msgpack, mtl
+ , prettyprinter, QuickCheck, quickcheck-text, refined, scientific
+ , servant, servant-client, servant-server, tasty, tasty-discover
+ , tasty-hspec, text, time, unordered-containers, vector, warp
}:
mkDerivation {
pname = "datadog-tracing";
- version = "1.2.0";
- sha256 = "1227rkrmlbqbxbvmyhm5yg5wd0jbbiy7vjyqq6vzksvpx2kifsdy";
+ version = "1.3.2";
+ sha256 = "0gag5cga8an4hd63n3vyjxrvgw309a8iw5if22j1dlc972qrzgs1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers ffunctor generic-random mtl
- prettyprinter QuickCheck quickcheck-text refined servant
- servant-client text time
+ aeson base bytestring containers ffunctor generic-random http-media
+ msgpack mtl prettyprinter QuickCheck quickcheck-text refined
+ scientific servant servant-client text time unordered-containers
+ vector
];
executableHaskellDepends = [
aeson base bytestring containers mtl servant servant-server text
@@ -64219,14 +64553,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "dejafu_2_0_0_1" = callPackage
+ "dejafu_2_1_0_0" = callPackage
({ mkDerivation, base, concurrency, containers, contravariant
, deepseq, exceptions, leancheck, profunctors, random, transformers
}:
mkDerivation {
pname = "dejafu";
- version = "2.0.0.1";
- sha256 = "0hdw4y81inxq4ivkfb4b7sj68ysb8n9czfyhifmhkqfaddg5inzg";
+ version = "2.1.0.0";
+ sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq";
libraryHaskellDepends = [
base concurrency containers contravariant deepseq exceptions
leancheck profunctors random transformers
@@ -64580,6 +64914,20 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "dependent-sum_0_5" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "dependent-sum";
+ version = "0.5";
+ sha256 = "1n5ln2fain1x9zkrzy1sknwm528lrdsnsg52z1d0hfpy5sngndsr";
+ revision = "2";
+ editedCabalFile = "1vxg9v2b5479qm7q9qzjyh9rmcdpr634s3kpjx0skqq0r68bc36s";
+ libraryHaskellDepends = [ base ];
+ description = "Dependent sum type";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dependent-sum-aeson-orphans" = callPackage
({ mkDerivation, aeson, base, constraints, constraints-extras
, dependent-map, dependent-sum
@@ -64719,14 +65067,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "deque_0_4_0_2" = callPackage
+ "deque_0_4_2" = callPackage
({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances
, rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "deque";
- version = "0.4.0.2";
- sha256 = "01ipk4dw8lgc5r3d224va9imli8wa5i8dknk7xzfv64pmm6gh6wa";
+ version = "0.4.2";
+ sha256 = "0zqz8akmkrkwcfkqmspr5dbk5dzhlsh7raxfvda40xhiwyni1cpf";
libraryHaskellDepends = [ base mtl strict-list ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -65409,6 +65757,8 @@ self: {
pname = "dhall";
version = "1.21.0";
sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv";
+ revision = "1";
+ editedCabalFile = "0ap1490jks9hmwf73vlrj7bsfrf4m5yvgqxx3ix57w23ia5gy662";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66988,8 +67338,8 @@ self: {
pname = "dimensional";
version = "1.3";
sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9";
- revision = "1";
- editedCabalFile = "1p6bn0xcxapm9r9b692l6kkijw0r41p1naiyx523pi5r0njs33k1";
+ revision = "2";
+ editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8";
libraryHaskellDepends = [
base deepseq exact-pi ieee754 numtype-dk semigroups vector
];
@@ -67625,17 +67975,19 @@ self: {
}) {};
"disjoint-containers" = callPackage
- ({ mkDerivation, aeson, base, containers, doctest, QuickCheck
- , quickcheck-classes, semigroups, transformers
+ ({ mkDerivation, aeson, base, containers, doctest, enum-types
+ , QuickCheck, quickcheck-classes, quickcheck-enum-instances
+ , semigroups, tasty, tasty-quickcheck, transformers
}:
mkDerivation {
pname = "disjoint-containers";
- version = "0.2.3";
- sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw";
+ version = "0.2.4";
+ sha256 = "0x64x327842da1a3bhbkrc88za300f3c2wd9fyci3qqm0mv7fdjk";
libraryHaskellDepends = [ aeson base containers transformers ];
testHaskellDepends = [
- aeson base containers doctest QuickCheck quickcheck-classes
- semigroups
+ aeson base containers doctest enum-types QuickCheck
+ quickcheck-classes quickcheck-enum-instances semigroups tasty
+ tasty-quickcheck
];
description = "Disjoint containers";
license = stdenv.lib.licenses.bsd3;
@@ -67803,8 +68155,8 @@ self: {
}:
mkDerivation {
pname = "distributed-closure";
- version = "0.4.1";
- sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny";
+ version = "0.4.1.1";
+ sha256 = "0w3n13a0rdi6cw5h3sivrfnr96qizd2hk0gma7b9c7hdh0sxw89r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68655,6 +69007,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dlist_0_8_0_6" = callPackage
+ ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
+ mkDerivation {
+ pname = "dlist";
+ version = "0.8.0.6";
+ sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq";
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [ base Cabal QuickCheck ];
+ description = "Difference lists";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dlist-instances" = callPackage
({ mkDerivation, base, dlist, semigroups }:
mkDerivation {
@@ -69393,12 +69758,16 @@ self: {
}) {};
"dom-lt" = callPackage
- ({ mkDerivation, array, base, containers }:
+ ({ mkDerivation, array, base, containers, criterion, deepseq }:
mkDerivation {
pname = "dom-lt";
- version = "0.1.3";
- sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga";
+ version = "0.2.0";
+ sha256 = "15jf1csnqwd56izw5zk6kbp2kk6y0zkgm9ddbwrk0k3ngmdqzkli";
+ revision = "1";
+ editedCabalFile = "1rkjm9ssi7j2klf11b8w1wlw3hg4ybcfxdi2klik6lm5mpb52x7w";
libraryHaskellDepends = [ array base containers ];
+ testHaskellDepends = [ base containers ];
+ benchmarkHaskellDepends = [ base containers criterion deepseq ];
description = "The Lengauer-Tarjan graph dominators algorithm";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -70979,6 +71348,22 @@ self: {
broken = true;
}) {};
+ "dynamic" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava
+ , containers, http-conduit, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "dynamic";
+ version = "0.0.6";
+ sha256 = "0z2mc09iffwh2wxp8j0kqpfh5nflnf3wzk554rx0l54sbszvxvw1";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring cassava containers http-conduit
+ text unordered-containers vector
+ ];
+ description = "A dynamic type for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dynamic-cabal" = callPackage
({ mkDerivation, base, containers, data-default, directory, doctest
, filepath, ghc, ghc-paths, haskell-generate, haskell-src-exts
@@ -71451,8 +71836,8 @@ self: {
({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
mkDerivation {
pname = "easytensor";
- version = "1.0.0.1";
- sha256 = "0ih92gikf67bq9p599vdb9p9dh4b8p7a687n3xiv3q9qm4pdc8aa";
+ version = "1.0.1.0";
+ sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k";
libraryHaskellDepends = [ base dimensions ];
testHaskellDepends = [ base Cabal dimensions QuickCheck ];
benchmarkHaskellDepends = [ base dimensions time ];
@@ -71466,8 +71851,8 @@ self: {
({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
mkDerivation {
pname = "easytensor-vulkan";
- version = "1.0.0.0";
- sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3";
+ version = "1.0.1.0";
+ sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9";
libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
description = "Use easytensor with vulkan-api";
license = stdenv.lib.licenses.bsd3;
@@ -72310,8 +72695,8 @@ self: {
pname = "either";
version = "5.0.1";
sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
- revision = "1";
- editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca";
+ revision = "2";
+ editedCabalFile = "0859h2dc77fq0f14jh11h4i89hrg3iqvzk0yrk78516k6m7n96zc";
libraryHaskellDepends = [
base bifunctors mtl profunctors semigroupoids semigroups
];
@@ -72782,8 +73167,8 @@ self: {
}:
mkDerivation {
pname = "elm-bridge";
- version = "0.5.0";
- sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3";
+ version = "0.5.1";
+ sha256 = "0d9544s892rhy0dkhzz6w3nryhbl26yahs4k1nkpgdqsxsnv4rvn";
libraryHaskellDepends = [ aeson base template-haskell ];
testHaskellDepends = [
aeson base containers hspec QuickCheck text
@@ -73082,10 +73467,8 @@ self: {
}:
mkDerivation {
pname = "elm-street";
- version = "0.0.0";
- sha256 = "0my3f08h019rhmyvcbf5xz87wnrd52fsqpiqj6jv1544psczc2sq";
- revision = "1";
- editedCabalFile = "1a6xx0an11kljw5l5y2mgpsll5515lz18nvpzxa0rc927nnpnf2y";
+ version = "0.0.1";
+ sha256 = "09rc10k6g23wf7b095rk6i2d9h5axlcmfpimhmbpqhm8vyqg72l7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -73189,8 +73572,8 @@ self: {
}:
mkDerivation {
pname = "elocrypt";
- version = "2.0.0";
- sha256 = "0dz5vdcg68fbwhvwz68zlsz5h2aaj1q6gacp1005hkxfb8156lp3";
+ version = "2.0.1";
+ sha256 = "1sb0xb4dx39vmr60slrlr85hwi6drmqdibv0faiw7k48rxvcz1ak";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base MonadRandom random ];
@@ -73205,19 +73588,19 @@ self: {
}) {};
"elsa" = callPackage
- ({ mkDerivation, array, base, dequeue, directory, filepath
- , hashable, json, megaparsec, mtl, tasty, tasty-hunit
+ ({ mkDerivation, ansi-terminal, array, base, dequeue, directory
+ , filepath, hashable, json, megaparsec, mtl, tasty, tasty-hunit
, unordered-containers
}:
mkDerivation {
pname = "elsa";
- version = "0.2.0.1";
- sha256 = "1ipi0vi3mwxmcmqmjk93ips7z3casqxzbls80aw2ysj43ii89m21";
+ version = "0.2.1.2";
+ sha256 = "0qg80wck4zsia9fsih06283c47f3waiskgj1r5s0s4fms9rwg06y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base dequeue directory filepath hashable json megaparsec mtl
- unordered-containers
+ ansi-terminal array base dequeue directory filepath hashable json
+ megaparsec mtl unordered-containers
];
executableHaskellDepends = [ base mtl ];
testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
@@ -73340,6 +73723,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "email-validate_2_3_2_11" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+ , QuickCheck, template-haskell
+ }:
+ mkDerivation {
+ pname = "email-validate";
+ version = "2.3.2.11";
+ sha256 = "051h1l6x4dpk2jg1bsxy32zswf8ridlix3k78k0h237gcassrfpb";
+ libraryHaskellDepends = [
+ attoparsec base bytestring template-haskell
+ ];
+ testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+ description = "Email address validation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"email-validate-json" = callPackage
({ mkDerivation, aeson, base, email-validate, text }:
mkDerivation {
@@ -73352,26 +73752,28 @@ self: {
}) {};
"email-validator" = callPackage
- ({ mkDerivation, base, bytestring, cmdargs, directory, dns, doctest
+ ({ mkDerivation, base, bytestring, cmdargs, dns, doctest
, email-validate, HUnit, parallel-io, pcre-light, tasty
, tasty-hunit
}:
mkDerivation {
pname = "email-validator";
- version = "0.0.3";
- sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n";
+ version = "1.0.0";
+ sha256 = "0l8c87kv80y1cpifcg80zhmdi884n7409w22akvc7kb9vvyp3b4v";
+ revision = "1";
+ editedCabalFile = "08ncdqjmgxlzsxfj8z0xaj1p5nnx4ndj4490gvfhj50kv2wx47iw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring cmdargs directory dns email-validate HUnit
- parallel-io pcre-light tasty tasty-hunit
+ base bytestring cmdargs dns email-validate HUnit parallel-io
+ pcre-light tasty tasty-hunit
];
testHaskellDepends = [
- base bytestring cmdargs directory dns doctest email-validate HUnit
+ base bytestring cmdargs dns doctest email-validate HUnit
parallel-io pcre-light tasty tasty-hunit
];
description = "Perform basic syntax and deliverability checks on email addresses";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -74464,18 +74866,22 @@ self: {
}) {};
"erd" = callPackage
- ({ mkDerivation, base, bytestring, containers, graphviz, parsec
- , text
+ ({ mkDerivation, base, bytestring, containers, graphviz, hspec
+ , parsec, QuickCheck, raw-strings-qq, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "erd";
- version = "0.1.3.0";
- sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09";
+ version = "0.2.0.0";
+ sha256 = "1lxqjvsmkqhqaw63r6qp6z9kjz73ki6y3vr85bjs5i0m7ff87799";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring containers graphviz parsec text
];
+ testHaskellDepends = [
+ base bytestring containers graphviz hspec parsec QuickCheck
+ raw-strings-qq tasty tasty-hunit text
+ ];
description = "An entity-relationship diagram generator from a plain text description";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -76268,6 +76674,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "exceptions_0_10_1" = callPackage
+ ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "exceptions";
+ version = "0.10.1";
+ sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v";
+ libraryHaskellDepends = [
+ base mtl stm template-haskell transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck stm template-haskell test-framework
+ test-framework-hunit test-framework-quickcheck2 transformers
+ transformers-compat
+ ];
+ description = "Extensible optionally-pure exceptions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"exchangerates" = callPackage
({ mkDerivation, aeson, base, containers, directory, genvalidity
, genvalidity-containers, genvalidity-hspec
@@ -77541,8 +77969,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "failable";
- version = "1.2.0.0";
- sha256 = "0iihl34739aq8y1fbgimyksjlaqf3ggw7q13zihd1bsa7jy255y9";
+ version = "1.2.0.1";
+ sha256 = "18lb0g4fi02mffhi61wd4rfcfx2ilrbrpl5wkyianw5mixjqlxms";
libraryHaskellDepends = [ base mtl transformers ];
description = "A 'Failable' error monad class to unify failure across monads that can fail";
license = stdenv.lib.licenses.bsd3;
@@ -77590,6 +78018,21 @@ self: {
broken = true;
}) {};
+ "fair" = callPackage
+ ({ mkDerivation, base, criterion, smallcheck, tasty
+ , tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "fair";
+ version = "0.1.0.0";
+ sha256 = "0x8nz1476pdmcaq99gvzs0ila78z1zhvdkyw886ly8ivfp49ix17";
+ libraryHaskellDepends = [ base util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Lists with fair choice";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fair-predicates" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -77659,6 +78102,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fakefs" = callPackage
+ ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }:
+ mkDerivation {
+ pname = "fakefs";
+ version = "0.2.0.0";
+ sha256 = "0r20w8grmcfr5vwh8j2kfg9lm9pkcq9cvgnrw1sj2vi38s96icwx";
+ libraryHaskellDepends = [ base containers mtl ];
+ testHaskellDepends = [ base containers hspec QuickCheck ];
+ description = "Extensible fake file system for testing";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"faker" = callPackage
({ mkDerivation, base, gimlh, random, split }:
mkDerivation {
@@ -78088,8 +78543,8 @@ self: {
}:
mkDerivation {
pname = "fastparser";
- version = "0.3.1.1";
- sha256 = "0wj50rpjr69sl4kkw6zybh2s9iq9ysv6sc83k50l5kq12p28yc5d";
+ version = "0.3.1.2";
+ sha256 = "0hyai0v9h4zlbr8fnal6l4z9y8zrh4ghhp2wymhf6fg23lahscid";
libraryHaskellDepends = [
base bytestring bytestring-lexing containers kan-extensions
microlens thyme transformers vector-space
@@ -80348,8 +80803,8 @@ self: {
}:
mkDerivation {
pname = "fix-imports";
- version = "2.1.0";
- sha256 = "1qi877cpfkp7lzdjwq2q6gqqkbvby63z6r22f3ydkx5362ins6kh";
+ version = "2.2.0";
+ sha256 = "0nwl9gxaxjdvgr0ji7r0hh9z43s473rb69dgb3p8ab3kdc3mld11";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -80499,8 +80954,8 @@ self: {
({ mkDerivation, async, base, clock, time }:
mkDerivation {
pname = "fixed-timestep";
- version = "0.1.0.0";
- sha256 = "1zhqh6y4j5v8vwf417jjgix5z1z67zrxgdpcrsyk4i8pi69892hv";
+ version = "0.2.0.1";
+ sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl";
libraryHaskellDepends = [ async base clock time ];
description = "Pure Haskell library to repeat an action at a specific frequency";
license = stdenv.lib.licenses.mit;
@@ -81325,6 +81780,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "flow_1_0_18" = callPackage
+ ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+ mkDerivation {
+ pname = "flow";
+ version = "1.0.18";
+ sha256 = "1cyac1la7pg7hkpdd2lhk4clh6g1zd2n0f479xvgn14ibs6ki3ph";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+ description = "Write more understandable Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"flow-er" = callPackage
({ mkDerivation, base, doctest, flow, QuickCheck }:
mkDerivation {
@@ -81747,6 +82215,21 @@ self: {
broken = true;
}) {inherit (pkgs) fluidsynth;};
+ "flush-queue" = callPackage
+ ({ mkDerivation, async, atomic-primops, base, containers, deepseq
+ , hspec, old-time, QuickCheck, stm
+ }:
+ mkDerivation {
+ pname = "flush-queue";
+ version = "1.0.0";
+ sha256 = "17b6izgpn9rdk3zdhp4kzsna6lv1lhdr8jr6yn2xcwznddb0zb69";
+ libraryHaskellDepends = [ atomic-primops base containers stm ];
+ testHaskellDepends = [ async base hspec QuickCheck stm ];
+ benchmarkHaskellDepends = [ async base deepseq old-time stm ];
+ description = "Concurrent bouded blocking queues optimized for flushing. Both IO and STM implementations.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"flux-monoid" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -81892,10 +82375,8 @@ self: {
}:
mkDerivation {
pname = "focuslist";
- version = "0.1.0.1";
- sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx";
- revision = "2";
- editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49";
+ version = "0.1.0.2";
+ sha256 = "06s8655l7nzpmwf6z8p11g9mngb9a0kw10riii67sq8jcanpllkq";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -84983,6 +85464,22 @@ self: {
broken = true;
}) {};
+ "fungll-combinators" = callPackage
+ ({ mkDerivation, array, base, containers, gll, pretty
+ , regex-applicative, text, time, TypeCompose
+ }:
+ mkDerivation {
+ pname = "fungll-combinators";
+ version = "0.1.0.1";
+ sha256 = "111cjr8jznm3jrf70jr89jhy36yhvikzdgv2vybqj43b1l2g8v4q";
+ libraryHaskellDepends = [
+ array base containers gll pretty regex-applicative text time
+ TypeCompose
+ ];
+ description = "GLL parser with simple combinator interface";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"funion" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, haskell98
, HFuse, unix
@@ -85053,6 +85550,17 @@ self: {
broken = true;
}) {};
+ "funspection" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "funspection";
+ version = "0.1.0.0";
+ sha256 = "1bq7gj8kcgz8ccy6skkqbrfkxavkg3s511shm8fd9s8syqwdglr8";
+ libraryHaskellDepends = [ base ];
+ description = "Type-level function utilities";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fused-effects" = callPackage
({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom
, QuickCheck, random
@@ -85067,15 +85575,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fused-effects_0_2_0_1" = callPackage
+ "fused-effects_0_3_0_0" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest, hspec
- , MonadRandom, QuickCheck, random
+ , MonadRandom, QuickCheck, random, transformers
}:
mkDerivation {
pname = "fused-effects";
- version = "0.2.0.1";
- sha256 = "1n5ywp07s4fhpjwnk15y72flwaxjd9dingr4xlrpkp00cgfh1ax8";
- libraryHaskellDepends = [ base deepseq MonadRandom random ];
+ version = "0.3.0.0";
+ sha256 = "1plivl5vdgzpb2pbbhyiv2i6jk39l43bwa574qs9nb5jx5i7n056";
+ libraryHaskellDepends = [
+ base deepseq MonadRandom random transformers
+ ];
testHaskellDepends = [ base doctest hspec QuickCheck ];
benchmarkHaskellDepends = [ base criterion ];
description = "A fast, flexible, fused effect system";
@@ -85112,57 +85622,38 @@ self: {
}) {};
"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
+ ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
+ , blaze-html, bytestring, containers, data-binary-ieee754
+ , directory, directory-tree, dlist, file-embed, filepath, free
+ , gitrev, happy, haskeline, http-client, http-client-tls
+ , http-conduit, language-c-quote, mainland-pretty, markdown
+ , megaparsec, mtl, neat-interpolation, parallel, parser-combinators
+ , process, process-extras, QuickCheck, random, regex-tdfa, srcloc
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary
+ , text, time, transformers, utf8-string, vector
, vector-binary-instances, versions, zip-archive, zlib
}:
mkDerivation {
pname = "futhark";
- version = "0.9.1";
- sha256 = "1l7i4xxh9zb53qqzznqj6kkh6p67a11kkr5839c9kkjwnb6sc86k";
+ version = "0.10.1";
+ sha256 = "03lmzl9z75vfy0phr1vkcxjkqhl1n9avkib7awflib90a6jhpl15";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- 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
+ aeson ansi-terminal array base binary blaze-html bytestring
+ containers data-binary-ieee754 directory directory-tree dlist
+ 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
+ parser-combinators process process-extras random regex-tdfa srcloc
+ template-haskell temporary text time transformers utf8-string
+ 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
- ];
+ executableHaskellDepends = [ base text ];
testHaskellDepends = [
- 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 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
+ base containers megaparsec mtl parser-combinators QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
];
description = "An optimising compiler for a functional, array-oriented language";
license = stdenv.lib.licenses.isc;
@@ -86309,10 +86800,8 @@ self: {
}:
mkDerivation {
pname = "generic-aeson";
- version = "0.2.0.9";
- sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l";
- revision = "4";
- editedCabalFile = "0m2m2wfv9nhq8m7xl1nrmj4wy3yip3s31b4448za58ryrwkdgjzd";
+ version = "0.2.0.10";
+ sha256 = "0dz7kib81234xmp7lzwww4vfnbpkq1pdalzvxxxqcjj31l0i803c";
libraryHaskellDepends = [
aeson attoparsec base generic-deriving mtl tagged text
unordered-containers vector
@@ -86380,21 +86869,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "generic-data_0_5_0_0" = callPackage
+ "generic-data_0_6_0_0" = callPackage
({ mkDerivation, base, base-orphans, contravariant, generic-lens
, one-liner, show-combinators, tasty, tasty-hunit
}:
mkDerivation {
pname = "generic-data";
- version = "0.5.0.0";
- sha256 = "1hy43a1f5y1ymszilz908sl7an7hj7sz7yzchhxh83ki2sf0ya7s";
+ version = "0.6.0.0";
+ sha256 = "0aiz7m78ysmx31754g28x0zls1kds12p2h3n35k7mxf7g1lla6fx";
libraryHaskellDepends = [
base base-orphans contravariant show-combinators
];
testHaskellDepends = [
base generic-lens one-liner tasty tasty-hunit
];
- description = "Utilities for GHC.Generics";
+ description = "Deriving instances with GHC.Generics and related utilities";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -86711,6 +87200,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "generics-mrsop_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, mtl, template-haskell }:
+ mkDerivation {
+ pname = "generics-mrsop";
+ version = "2.0.0";
+ sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml";
+ libraryHaskellDepends = [ base containers mtl template-haskell ];
+ description = "Generic Programming with Mutually Recursive Sums of Products";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-sop" = callPackage
({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
, template-haskell
@@ -88147,8 +88648,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.8.0.1";
- sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99";
+ version = "0.8.0.2";
+ sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -88812,6 +89313,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-syntax-highlighter_0_0_3_1" = callPackage
+ ({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
+ mkDerivation {
+ pname = "ghc-syntax-highlighter";
+ version = "0.0.3.1";
+ sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base ghc text ];
+ testHaskellDepends = [ base hspec text ];
+ testToolDepends = [ hspec-discover ];
+ description = "Syntax highlighter for Haskell using lexer of GHC itself";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-tcplugins-extra" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -90600,8 +91116,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "7.20190219";
- sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2";
+ version = "7.20190322";
+ sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -92442,8 +92958,8 @@ self: {
}:
mkDerivation {
pname = "glue-common";
- version = "0.6.2";
- sha256 = "063y0q6iz4s5hqjc4cpd2y49w9zq6w3lcnvxlv73miysb9q16a4b";
+ version = "0.6.3";
+ sha256 = "12lvq3lc52ggflcb8m6j8xxxi4p5mspfwbc4fxb34h1076gxhdd1";
libraryHaskellDepends = [
base hashable lifted-base monad-control text time transformers
transformers-base unordered-containers
@@ -92468,8 +92984,8 @@ self: {
}:
mkDerivation {
pname = "glue-core";
- version = "0.6.2";
- sha256 = "0z6il1ff3cgzk0bvgp2c1lp7qn4ws0nd2asm1x15cb8498iyqlaa";
+ version = "0.6.3";
+ sha256 = "06bjmhnm2g9vmxjrw661ips3c6160xbw1qj4527radif51lskf6i";
libraryHaskellDepends = [
base glue-common hashable lifted-base monad-control text time
transformers transformers-base unordered-containers
@@ -92494,8 +93010,8 @@ self: {
}:
mkDerivation {
pname = "glue-ekg";
- version = "0.6.2";
- sha256 = "10a2ma35mk3plwcsn80ccc879ajz0ifyl8xqifn0kfz3dpk7g0y7";
+ version = "0.6.3";
+ sha256 = "1z93jflgnj5ja17gpa8ab0i8lvm2x4vcqbmil3zca2djnbg61257";
libraryHaskellDepends = [
base ekg-core glue-common hashable lifted-base monad-control text
time transformers transformers-base unordered-containers
@@ -92519,8 +93035,8 @@ self: {
}:
mkDerivation {
pname = "glue-example";
- version = "0.6.2";
- sha256 = "182ky7k17wfc0cijyhib8j0ajw963yrbq9y91lsvvd7vnjfwds1x";
+ version = "0.6.3";
+ sha256 = "0pczlmny8brmr24v6zfdkarx4sy530j4454p9agswrc7s37fhf5n";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -96457,8 +96973,8 @@ self: {
}:
mkDerivation {
pname = "graphmod";
- version = "1.4.2";
- sha256 = "196647zh8cz7gpm7z18wqsx0rad3mvq7qrl20varvi34hxck6fwq";
+ version = "1.4.3";
+ sha256 = "1hcj1pmb65a4wkdn2d1p6b7hf91p4dqb9gprihrldfc6xii3hc3z";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -96901,6 +97417,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "greskell-core_0_1_2_5" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, doctest
+ , doctest-discover, hashable, hspec, QuickCheck, scientific
+ , semigroups, text, unordered-containers, uuid, vector
+ }:
+ mkDerivation {
+ pname = "greskell-core";
+ version = "0.1.2.5";
+ sha256 = "1lxz9l968f8jgyyqvph3rvsfnh0kqdmnam95cn97jrfwcndc0wmp";
+ libraryHaskellDepends = [
+ aeson base containers hashable scientific semigroups text
+ unordered-containers uuid vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring doctest doctest-discover hspec QuickCheck
+ text unordered-containers vector
+ ];
+ description = "Haskell binding for Gremlin graph query language - core data types and tools";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"greskell-websocket" = callPackage
({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
, greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -99526,8 +100064,8 @@ self: {
pname = "hackage-security";
version = "0.5.3.0";
sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
- revision = "4";
- editedCabalFile = "1mkk6vkq681rgq159rgr73vlkch0z5cj3vbmz0n6540y8i3zs3mp";
+ revision = "5";
+ editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -100080,8 +100618,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.16.1";
- sha256 = "1g71s2bzj9w97nd3pjyk8ldi4kd5j4pnxy9rmvnwz645zl998fny";
+ version = "1.16.3";
+ sha256 = "0wpgj4gp6xjgk2564219cg3w54a3lfb9p3bmgdkf1pm6ilbzbf2n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102698,8 +103236,8 @@ self: {
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "has";
- version = "0.5.0.1";
- sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s";
+ version = "0.6.0.1";
+ sha256 = "1w2pdc4vyxd0wl700ba077d5aw7nkjw7nqhm8ydnsjgrv3xvhgah";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base QuickCheck ];
@@ -103813,8 +104351,8 @@ self: {
}:
mkDerivation {
pname = "haskell-dap";
- version = "0.0.12.0";
- sha256 = "0n1abvz7a03d3xgkykkk2ggm74lsh1kg0jv0z1k9874pncxx4li4";
+ version = "0.0.13.0";
+ sha256 = "1hyy1jx5b7k3rhk3xmr4nsx2ay7jgq70nxy01a7ap1y4gzy9pjns";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -106251,24 +106789,28 @@ self: {
"haskoin-node" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
- , data-default, hashable, haskoin-core, hspec, hspec-discover
- , HUnit, monad-logger, mtl, network, nqe, random, resourcet
- , rocksdb-haskell, rocksdb-query, safe, string-conversions, text
- , time, transformers, unliftio, unordered-containers
+ , containers, data-default, hashable, haskoin-core, hspec
+ , hspec-discover, HUnit, monad-logger, mtl, network, nqe, random
+ , resourcet, rocksdb-haskell, rocksdb-query, safe
+ , string-conversions, text, time, transformers, unliftio
+ , unordered-containers
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.9.5";
- sha256 = "1c0nms9q9x0fsg1hkn5kz8jpal79b0143yca156nb563bdlx0pfd";
+ version = "0.9.6";
+ sha256 = "1mcncj4j5xa650y36irffrbpb5r79xna84vpjyc21nkdqag0yqa3";
libraryHaskellDepends = [
- base bytestring cereal conduit conduit-extra data-default hashable
- haskoin-core monad-logger mtl network nqe random resourcet
- rocksdb-haskell rocksdb-query string-conversions text time
- transformers unliftio unordered-containers
+ base bytestring cereal conduit conduit-extra containers
+ data-default hashable haskoin-core monad-logger mtl network nqe
+ random resourcet rocksdb-haskell rocksdb-query string-conversions
+ text time transformers unliftio unordered-containers
];
testHaskellDepends = [
- base bytestring cereal haskoin-core hspec HUnit monad-logger mtl
- network nqe random rocksdb-haskell safe unliftio
+ base bytestring cereal conduit conduit-extra containers
+ data-default hashable haskoin-core hspec HUnit monad-logger mtl
+ network nqe random resourcet rocksdb-haskell rocksdb-query safe
+ string-conversions text time transformers unliftio
+ unordered-containers
];
testToolDepends = [ hspec-discover ];
description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
@@ -106324,34 +106866,41 @@ self: {
}) {};
"haskoin-store" = callPackage
- ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit
+ ({ mkDerivation, aeson, base, 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
+ , network, nqe, optparse-applicative, protocol-buffers
+ , protocol-buffers-descriptor, random, rocksdb-haskell
, rocksdb-query, scotty, string-conversions, text, time
, transformers, unliftio, unordered-containers
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.11.2";
- sha256 = "0jjpr2a1p88dkz17q84yp7y2as2j0i5bj0x0prl1hd9yy4y3aql4";
+ version = "0.13.0";
+ sha256 = "0b34x0z44dw7k9dqn9qx66sy33jfgg7ky1ysh7cv25g1w6v7slqy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
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
+ hashable haskoin-core haskoin-node http-types monad-logger mtl
+ network nqe protocol-buffers protocol-buffers-descriptor random
+ rocksdb-haskell rocksdb-query scotty string-conversions text time
transformers unliftio unordered-containers
];
executableHaskellDepends = [
- 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
+ aeson base bytestring cereal conduit containers data-default
+ directory filepath hashable haskoin-core haskoin-node http-types
+ monad-logger mtl network nqe optparse-applicative protocol-buffers
+ protocol-buffers-descriptor random rocksdb-haskell rocksdb-query
+ scotty string-conversions text time transformers unliftio
+ unordered-containers
];
testHaskellDepends = [
- base data-default haskoin-core haskoin-node hspec monad-logger mtl
- nqe rocksdb-haskell transformers unliftio unordered-containers
+ aeson base bytestring cereal conduit containers data-default
+ hashable haskoin-core haskoin-node hspec http-types monad-logger
+ mtl network nqe protocol-buffers protocol-buffers-descriptor random
+ rocksdb-haskell rocksdb-query scotty string-conversions text time
+ transformers unliftio unordered-containers
];
description = "Storage and index for Bitcoin and Bitcoin Cash";
license = stdenv.lib.licenses.publicDomain;
@@ -109401,16 +109950,14 @@ self: {
"hedgehog-classes" = callPackage
({ mkDerivation, aeson, base, containers, hedgehog, pretty-show
- , transformers, wl-pprint-annotated
+ , semirings, transformers, wl-pprint-annotated
}:
mkDerivation {
pname = "hedgehog-classes";
- version = "0.1.1.0";
- sha256 = "1fi4n7g6daf9a8dzc876830jqdlc6pl5nyb9q7q9rffiv43sbmv2";
- revision = "2";
- editedCabalFile = "0m1ajqbg5k9k7xmgq5xm7s6l3lckr634bfsnbm9ydkr0cgs8rwcc";
+ version = "0.1.2";
+ sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv";
libraryHaskellDepends = [
- aeson base containers hedgehog pretty-show transformers
+ aeson base containers hedgehog pretty-show semirings transformers
wl-pprint-annotated
];
testHaskellDepends = [ aeson base containers hedgehog ];
@@ -111226,7 +111773,7 @@ self: {
libraryToolDepends = [ CoreServices ];
description = "File/folder watching for OS X";
license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.none;
+ platforms = [ "x86_64-darwin" ];
}) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
@@ -111372,6 +111919,8 @@ self: {
pname = "hgeometry";
version = "0.8.0.0";
sha256 = "0hypd5936kssw435lcvqj9d7whdzfdfbhvi5hhbi90k5x89xfx6f";
+ revision = "1";
+ editedCabalFile = "1hln65kfw2ji43pkwipyg12i0lq9ly6p3hv2xd7vzp4pzkcpy3zz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -112578,8 +113127,8 @@ self: {
}:
mkDerivation {
pname = "hinterface";
- version = "0.9.0";
- sha256 = "0hkz9p3ljfqvmf07pkkijav3lppvwvyp5hvlqbqcfplmv9n84wdb";
+ version = "0.10.0";
+ sha256 = "0a89h3vn8arms93fj3p3ip208wamljkdxikkg7dlrf143iymcs8n";
libraryHaskellDepends = [
array async base binary bytestring containers cryptonite deepseq
exceptions lifted-async lifted-base memory monad-control
@@ -113005,6 +113554,8 @@ self: {
executableHaskellDepends = [ base ];
description = "Haskell Git Helper Tool";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hjcase" = callPackage
@@ -113300,10 +113851,8 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.14.1";
- sha256 = "139iqa7kpnn2r9r3awbpmhbgn7nvybppmx648fjk6hgsivggjpay";
- revision = "1";
- editedCabalFile = "1ivk3hdzhlb5xdkmiqvbnhj7hjfv7kx4h70q14xrxp0wl8jpiqvd";
+ version = "1.14.2";
+ sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113481,8 +114030,8 @@ self: {
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.14";
- sha256 = "0nj8qrqkvmxmq0sqhq1z5i3zfivb7glsnv37g9k5ag6vcr48r7i8";
+ version = "1.14.1";
+ sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2";
libraryHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -113504,6 +114053,27 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "hledger-makeitso" = callPackage
+ ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time
+ , turtle
+ }:
+ mkDerivation {
+ pname = "hledger-makeitso";
+ version = "0.9.0.1";
+ sha256 = "1114yxv9n7zpay1yn962jjrdmaryv3f4p4aiqph1h0b2zj4bli0r";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers foldl stm text time turtle
+ ];
+ executableHaskellDepends = [ base text turtle ];
+ testHaskellDepends = [
+ base containers foldl HUnit stm text turtle
+ ];
+ description = "An hledger workflow focusing on automated statement import and classification";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"hledger-ui" = callPackage
({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
, brick, cmdargs, containers, data-default, directory, filepath
@@ -113513,8 +114083,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.14";
- sha256 = "1pnzbc4myyqlz4rc1lm1acyynvkhxwdd82fl2rrwc31phj1b46jk";
+ version = "1.14.2";
+ sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -113559,8 +114129,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.14";
- sha256 = "15ajph5cmc1a44lqw42020pb4znkrpgx3wk5dl26pbynilm5247b";
+ version = "1.14.1";
+ sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113917,8 +114487,10 @@ self: {
({ mkDerivation, base, hmatrix, liblapack, transformers }:
mkDerivation {
pname = "hmatrix-banded";
- version = "0.0.0.2";
- sha256 = "0civscp7bqqcdfnz33ypg86ly98d42f1jhyz3fyi667g9rfq4fyb";
+ version = "0.0.0.3";
+ sha256 = "1vmvgxvyllqgp7cb2yrfqir99gcxn50s7gc9117g2fq8m3dqq34f";
+ revision = "1";
+ editedCabalFile = "0q58d297a555xb9mrpri9p30wyr5jmi46afixrh3hlvldddkw663";
libraryHaskellDepends = [ base hmatrix transformers ];
librarySystemDepends = [ liblapack ];
description = "HMatrix interface to LAPACK functions for banded matrices";
@@ -114508,58 +115080,62 @@ self: {
}) {inherit (pkgs) netcdf;};
"hnix" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, array, base
- , base16-bytestring, binary, bytestring, containers, criterion
- , cryptohash-md5, cryptohash-sha1, cryptohash-sha256
- , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
- , directory, exceptions, filepath, generic-random, Glob, hashable
- , hashing, haskeline, hedgehog, hspec-discover, http-client
+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+ , bytestring, comonad, containers, criterion, cryptohash-md5
+ , cryptohash-sha1, cryptohash-sha256, cryptohash-sha512, data-fix
+ , deepseq, dependent-sum, deriving-compat, Diff, directory
+ , exceptions, filepath, free, generic-random, Glob, hashable
+ , hashing, haskeline, hedgehog, hnix-store-core, http-client
, http-client-tls, http-types, interpolate, lens-family
- , lens-family-core, lens-family-th, logict, megaparsec, monadlist
- , mtl, optparse-applicative, pretty-show, process, regex-tdfa
- , regex-tdfa-text, repline, scientific, semigroups, serialise
- , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
- , tasty-th, template-haskell, text, these, time, transformers, unix
- , unordered-containers, vector, xml
+ , lens-family-core, lens-family-th, logict, megaparsec
+ , monad-control, monadlist, mtl, optparse-applicative
+ , parser-combinators, pretty-show, prettyprinter, process, ref-tf
+ , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
+ , serialise, split, syb, tasty, tasty-hedgehog, tasty-hunit
+ , tasty-quickcheck, tasty-th, template-haskell, text, these, time
+ , transformers, transformers-base, unix, unordered-containers
+ , vector, xml
}:
mkDerivation {
pname = "hnix";
- version = "0.5.2";
- sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk";
+ version = "0.6.0";
+ sha256 = "1yirs9q2hm7h8zahc053q129s5iab6c24745hin4hik0ghdqw6k7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint array base base16-bytestring binary bytestring
+ aeson array base base16-bytestring binary bytestring comonad
containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
- cryptohash-sha512 data-fix deepseq deriving-compat directory
- exceptions filepath hashable hashing haskeline http-client
- http-client-tls http-types interpolate lens-family lens-family-core
- lens-family-th logict megaparsec monadlist mtl optparse-applicative
- pretty-show process regex-tdfa regex-tdfa-text scientific
- semigroups serialise split syb template-haskell text these time
- transformers unix unordered-containers vector xml
+ cryptohash-sha512 data-fix deepseq dependent-sum deriving-compat
+ directory exceptions filepath free hashable hashing haskeline
+ hnix-store-core http-client http-client-tls http-types interpolate
+ lens-family lens-family-core lens-family-th logict megaparsec
+ monad-control monadlist mtl optparse-applicative parser-combinators
+ pretty-show prettyprinter process ref-tf regex-tdfa regex-tdfa-text
+ scientific semigroups serialise split syb template-haskell text
+ these time transformers transformers-base unix unordered-containers
+ vector xml
];
executableHaskellDepends = [
- aeson ansi-wl-pprint base base16-bytestring bytestring containers
+ aeson base base16-bytestring bytestring comonad containers
cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
data-fix deepseq exceptions filepath hashing haskeline mtl
- optparse-applicative pretty-show repline serialise template-haskell
- text time transformers unordered-containers
+ optparse-applicative pretty-show prettyprinter ref-tf repline
+ serialise template-haskell text time transformers
+ unordered-containers
];
testHaskellDepends = [
- ansi-wl-pprint base base16-bytestring bytestring containers
- cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
- data-fix deepseq Diff directory exceptions filepath generic-random
- Glob hashing hedgehog interpolate megaparsec mtl
- optparse-applicative pretty-show process serialise split tasty
- tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+ base base16-bytestring bytestring containers cryptohash-md5
+ cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix
+ deepseq dependent-sum Diff directory exceptions filepath
+ generic-random Glob hashing hedgehog interpolate megaparsec mtl
+ optparse-applicative pretty-show prettyprinter process serialise
+ split tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
template-haskell text time transformers unix unordered-containers
];
- testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
- ansi-wl-pprint base base16-bytestring bytestring containers
- criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
- cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl
+ base base16-bytestring bytestring containers criterion
+ cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+ data-fix deepseq exceptions filepath hashing mtl
optparse-applicative serialise template-haskell text time
transformers unordered-containers
];
@@ -114569,6 +115145,56 @@ self: {
broken = true;
}) {};
+ "hnix-store-core" = callPackage
+ ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary
+ , bytestring, containers, cryptohash-md5, cryptohash-sha1
+ , cryptohash-sha256, directory, filepath, hashable, mtl, process
+ , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec
+ , tasty-hunit, tasty-quickcheck, temporary, text, unix
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hnix-store-core";
+ version = "0.1.0.0";
+ sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347";
+ libraryHaskellDepends = [
+ base base16-bytestring binary bytestring containers cryptohash-md5
+ cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl
+ regex-base regex-tdfa-text text unix unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base base64-bytestring binary bytestring containers directory
+ process tasty tasty-discover tasty-hspec tasty-hunit
+ tasty-quickcheck temporary text
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Core effects for interacting with the Nix store";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "hnix-store-remote" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , containers, hnix-store-core, mtl, network, pretty-simple, text
+ , unix, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hnix-store-remote";
+ version = "0.1.0.0";
+ sha256 = "04dmql5235z05hq36wnbgc3sk0izqryv7n8dh8r3dq2j87zvv3y8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring containers hnix-store-core
+ mtl network text unix unordered-containers
+ ];
+ executableHaskellDepends = [
+ base bytestring hnix-store-core mtl pretty-simple
+ unordered-containers
+ ];
+ description = "Remote hnix store";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"hnn" = callPackage
({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random
, random, vector, vector-binary-instances, zlib
@@ -115540,8 +116166,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.5";
- sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60";
+ version = "5.0.17.6";
+ sha256 = "0kgcgadrp02pcwp0pp56p09kvw3k9i6n4r7qsms3lagq1wcar4dv";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -117462,6 +118088,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hs-functors_0_1_4_0" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "hs-functors";
+ version = "0.1.4.0";
+ sha256 = "0crih1v1zg0w1m4xcsz1v00j4x2w82fdd17bkhiqa1d56kx3d1af";
+ libraryHaskellDepends = [ base transformers ];
+ description = "Functors from products of Haskell and its dual to Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hs-gchart" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -117733,6 +118371,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hs-profunctors" = callPackage
+ ({ mkDerivation, base, hs-functors }:
+ mkDerivation {
+ pname = "hs-profunctors";
+ version = "0.1.0.0";
+ sha256 = "09iylf1xjxsikjyaib9902na33bkfs8nv3wasyvikg4g82xqay5y";
+ libraryHaskellDepends = [ base hs-functors ];
+ description = "Profunctors from Haskell to Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hs-re" = callPackage
({ mkDerivation, array, base, regex-base, regex-posix }:
mkDerivation {
@@ -118092,6 +118741,8 @@ self: {
pname = "hsaml2";
version = "0.1";
sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck";
+ revision = "1";
+ editedCabalFile = "0xvyzq2y94za0ggrlcxvpz4g29jxdcjp3ga8f77hr0f4hfz4z10l";
libraryHaskellDepends = [
asn1-encoding asn1-types base base64-bytestring bytestring
cryptonite data-default http-types hxt hxt-charproperties
@@ -120040,14 +120691,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec_2_7_0" = callPackage
+ "hspec_2_7_1" = callPackage
({ mkDerivation, base, hspec-core, hspec-discover
, hspec-expectations, QuickCheck
}:
mkDerivation {
pname = "hspec";
- version = "2.7.0";
- sha256 = "1qbikvd91cimbn439zwsdcrz0hsl7n2w4cl0vlcw8kbf94nm6z7z";
+ version = "2.7.1";
+ sha256 = "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341";
libraryHaskellDepends = [
base hspec-core hspec-discover hspec-expectations QuickCheck
];
@@ -120127,7 +120778,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-core_2_7_0" = callPackage
+ "hspec-core_2_7_1" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, hspec-meta
, HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -120135,8 +120786,8 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.7.0";
- sha256 = "1y4j0ivngz7jrff1riyy2iirnb5kc9p4cr619wdrsrvrm3blgzrz";
+ version = "2.7.1";
+ sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c";
libraryHaskellDepends = [
ansi-terminal array base call-stack clock deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -120192,13 +120843,13 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-discover_2_7_0" = callPackage
+ "hspec-discover_2_7_1" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
}:
mkDerivation {
pname = "hspec-discover";
- version = "2.7.0";
- sha256 = "1n3by0dn3x3kfy7vnyfdz0dr2wwwj82m0ijlm9s1n6aa976xddhw";
+ version = "2.7.1";
+ sha256 = "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -123330,8 +123981,8 @@ self: {
}:
mkDerivation {
pname = "http2-client-grpc";
- version = "0.5.0.4";
- sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv";
+ version = "0.6.0.0";
+ sha256 = "0cf6asfh8wmjh1j0i1ldh557n33q1k1kfj604rz7rrrcarmn0m5h";
libraryHaskellDepends = [
async base binary bytestring case-insensitive data-default-class
http2 http2-client http2-grpc-types lens proto-lens text tls
@@ -123349,10 +124000,8 @@ self: {
}:
mkDerivation {
pname = "http2-grpc-types";
- version = "0.3.0.0";
- sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5";
- revision = "2";
- editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c";
+ version = "0.4.0.0";
+ sha256 = "1h15smbncifn0c9n0dmwzpwr0fnb3jby9zch71rmsnsirclycsb5";
libraryHaskellDepends = [
base binary bytestring case-insensitive proto-lens zlib
];
@@ -123375,6 +124024,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "httpd-shed_0_4_1_0" = callPackage
+ ({ mkDerivation, base, network, network-bsd, network-uri }:
+ mkDerivation {
+ pname = "httpd-shed";
+ version = "0.4.1.0";
+ sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base network network-bsd network-uri ];
+ description = "A simple web-server with an interact style API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"https-everywhere-rules" = callPackage
({ mkDerivation, attoparsec, base, errors, functor-infix, hspec
, http-client, https-everywhere-rules-raw, lens, network, pipes
@@ -123761,12 +124424,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hunit-dejafu_2_0_0_0" = callPackage
+ "hunit-dejafu_2_0_0_1" = callPackage
({ mkDerivation, base, dejafu, exceptions, HUnit }:
mkDerivation {
pname = "hunit-dejafu";
- version = "2.0.0.0";
- sha256 = "0j48wg6nq90hgl3jfdiy020az5m8vcpbnfvxcpjci3vzd24c4gx9";
+ version = "2.0.0.1";
+ sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz";
libraryHaskellDepends = [ base dejafu exceptions HUnit ];
description = "Deja Fu support for the HUnit test framework";
license = stdenv.lib.licenses.mit;
@@ -124198,6 +124861,30 @@ self: {
broken = true;
}) {};
+ "hw-bits_0_7_0_6" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+ , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
+ , hw-string-parse, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-bits";
+ version = "0.7.0.6";
+ sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm";
+ libraryHaskellDepends = [
+ base bytestring hw-int hw-prim hw-string-parse safe vector
+ ];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Bit manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-conduit" = callPackage
({ mkDerivation, array, base, bytestring, conduit
, conduit-combinators, criterion, hspec, mmap, time, transformers
@@ -124397,8 +125084,8 @@ self: {
({ mkDerivation, base, hedgehog, vector }:
mkDerivation {
pname = "hw-hedgehog";
- version = "0.1.0.2";
- sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby";
+ version = "0.1.0.3";
+ sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2";
libraryHaskellDepends = [ base hedgehog vector ];
testHaskellDepends = [ base ];
description = "Extra hedgehog functionality";
@@ -124469,6 +125156,27 @@ self: {
broken = true;
}) {};
+ "hw-ip_2_3_1_0" = callPackage
+ ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
+ , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
+ }:
+ mkDerivation {
+ pname = "hw-ip";
+ version = "2.3.1.0";
+ sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363";
+ libraryHaskellDepends = [
+ appar base containers generic-lens hw-bits iproute text
+ ];
+ testHaskellDepends = [
+ appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
+ text
+ ];
+ description = "Library for manipulating IP addresses and CIDR blocks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-json" = callPackage
({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
, bytestring, containers, criterion, directory, dlist, hspec
@@ -124767,6 +125475,32 @@ self: {
broken = true;
}) {};
+ "hw-prim_0_6_2_23" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, mmap
+ , QuickCheck, semigroups, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-prim";
+ version = "0.6.2.23";
+ sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy";
+ libraryHaskellDepends = [
+ base bytestring mmap semigroups transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions hedgehog hspec
+ hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion mmap semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-prim-bits" = callPackage
({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
, hw-hspec-hedgehog, QuickCheck, vector
@@ -124824,6 +125558,42 @@ self: {
broken = true;
}) {};
+ "hw-rankselect_0_13_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
+ , directory, generic-lens, hedgehog, hspec, hspec-discover
+ , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog
+ , hw-prim, hw-rankselect-base, lens, mmap, mtl
+ , optparse-applicative, QuickCheck, resourcet, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-rankselect";
+ version = "0.13.0.0";
+ sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base
+ vector
+ ];
+ executableHaskellDepends = [
+ base directory generic-lens hw-bits hw-prim hw-rankselect-base lens
+ mmap mtl optparse-applicative vector
+ ];
+ testHaskellDepends = [
+ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
+ hw-prim hw-rankselect-base mmap QuickCheck transformers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring conduit criterion directory hw-bits hw-prim
+ hw-rankselect-base mmap resourcet vector
+ ];
+ description = "Rank-select";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-rankselect-base" = callPackage
({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim
@@ -125109,23 +125879,22 @@ self: {
"hwormhole" = callPackage
({ mkDerivation, aeson, async, base, binary, binary-conduit
, bytestring, conduit, conduit-extra, containers, cryptonite
- , directory, filepath, haskeline, hedgehog, hex, hspec
- , magic-wormhole, memory, mtl, network, network-info
- , optparse-applicative, pathwalk, protolude, random, saltine
- , spake2, temporary, text, transformers, unix-compat, zip
+ , directory, filepath, haskeline, hedgehog, hspec, magic-wormhole
+ , memory, mtl, network, network-info, optparse-applicative
+ , pathwalk, pgp-wordlist, protolude, random, saltine, spake2
+ , temporary, text, transformers, unix-compat, zip
}:
mkDerivation {
pname = "hwormhole";
- version = "0.2.0.0";
- sha256 = "0y0wg4zxq8wzym8x7b103h0ai2z5ji22vvqz4i64pnzq83ksmxym";
+ version = "0.2.0.1";
+ sha256 = "1y3x13lh1g048a1myk5kkm078b34p4rdfhjcvfc991ys5zc46sir";
isLibrary = true;
isExecutable = true;
- enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson async base binary bytestring conduit conduit-extra containers
- cryptonite directory filepath haskeline hex magic-wormhole memory
- mtl network network-info pathwalk protolude random saltine spake2
- temporary text transformers unix-compat zip
+ cryptonite directory filepath haskeline magic-wormhole memory mtl
+ network network-info pathwalk pgp-wordlist protolude random saltine
+ spake2 temporary text transformers unix-compat zip
];
executableHaskellDepends = [
aeson base binary bytestring optparse-applicative protolude text
@@ -127788,8 +128557,8 @@ self: {
}:
mkDerivation {
pname = "imperative-edsl";
- version = "0.7.1";
- sha256 = "0cia9yq5z7h3024kwhwjzzaq97281aib1nwimj6b4rp425yfybfr";
+ version = "0.8";
+ sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar";
libraryHaskellDepends = [
array base BoundedChan containers data-default-class deepseq
directory exception-transformers ghc-prim language-c-quote
@@ -128196,6 +128965,26 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "incremental-parser_0_3_2_2" = callPackage
+ ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+ , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "incremental-parser";
+ version = "0.3.2.2";
+ sha256 = "0mnqi0fnh5sl1fp74gcwvfm6mxhzrs1x7yl235yl0dhcyjp3vfx7";
+ 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-sat-solver" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -128647,6 +129436,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "influxdb_1_6_1_3" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, scientific, tagged
+ , template-haskell, text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.6.1.3";
+ sha256 = "1l03bwmwxb42cha8v3fj616ks927mcklxrmqxrr1ms53m7bsa587";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [ base doctest template-haskell ];
+ description = "Haskell client library for InfluxDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -130368,8 +131181,8 @@ self: {
}:
mkDerivation {
pname = "ip";
- version = "1.4.2";
- sha256 = "0r1ipv6mcbxpzwkfhr6hm2srr01wr5np20axgvqvplaskai9cj87";
+ version = "1.4.2.1";
+ sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq hashable primitive text
vector
@@ -130389,6 +131202,36 @@ self: {
broken = true;
}) {};
+ "ip_1_5_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+ , deepseq, doctest, hashable, hspec, hspec-discover, HUnit
+ , primitive, QuickCheck, quickcheck-classes, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, vector
+ , wide-word
+ }:
+ mkDerivation {
+ pname = "ip";
+ version = "1.5.0";
+ sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring deepseq hashable primitive text
+ vector wide-word
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring doctest hspec HUnit QuickCheck
+ quickcheck-classes test-framework test-framework-hunit
+ test-framework-quickcheck2 text wide-word
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion text
+ ];
+ description = "Library for IP and MAC addresses";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ip-quoter" = callPackage
({ mkDerivation, base, cpu, network, tasty, tasty-hunit
, template-haskell
@@ -132164,8 +133007,8 @@ self: {
({ mkDerivation, base, hspec, QuickCheck, time }:
mkDerivation {
pname = "japanese-calendar";
- version = "0.1.0.2";
- sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy";
+ version = "0.1.1.0";
+ sha256 = "0nii20qc7w0m2kjbbhg91iad497hlrd35l29xri0lrjmk9s1hsnw";
libraryHaskellDepends = [ base time ];
testHaskellDepends = [ base hspec QuickCheck time ];
description = "Data type of Japanese Calendar (Wareki)";
@@ -132173,17 +133016,14 @@ self: {
}) {};
"japanese-holidays" = callPackage
- ({ mkDerivation, base, doctest, hspec, QuickCheck
- , quickcheck-instances, time
- }:
+ ({ mkDerivation, base, doctest, hspec, hspec-discover, time }:
mkDerivation {
pname = "japanese-holidays";
- version = "0.1.1.0";
- sha256 = "1xcamcv6n6k2pmbhxy9dbzff94cr2ijf2ykvyrc3s2idk6jhd2bh";
+ version = "0.2.0.0";
+ sha256 = "13v8ibbz0sb7rw8y8v1dnyfpc3mc83x63dijnrl45xglwmi2qnjk";
libraryHaskellDepends = [ base time ];
- testHaskellDepends = [
- base doctest hspec QuickCheck quickcheck-instances time
- ];
+ testHaskellDepends = [ base doctest hspec time ];
+ testToolDepends = [ hspec-discover ];
description = "Japanese holidays utility";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -133651,8 +134491,8 @@ self: {
pname = "json-rpc-client";
version = "0.2.5.0";
sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
- revision = "9";
- editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm";
+ revision = "10";
+ editedCabalFile = "19vf7gibvqgcm27b5n0ls4s7wi1kr87crn776ifqc9gbr2l9bfpi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134455,10 +135295,10 @@ self: {
}:
mkDerivation {
pname = "jwt";
- version = "0.9.0";
- sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395";
+ version = "0.10.0";
+ sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w";
revision = "1";
- editedCabalFile = "1vpd4pq8mh4dha7i2pfv4iqpw411yachzkf7p9rnfyicipj53pw2";
+ editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi";
libraryHaskellDepends = [
aeson base bytestring containers cryptonite http-types memory
network-uri scientific semigroups text time unordered-containers
@@ -134944,7 +135784,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "katip_0_8_1_0" = callPackage
+ "katip_0_8_2_0" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-builder
, bytestring, containers, criterion, deepseq, directory, either
, filepath, hostname, microlens, microlens-th, monad-control, mtl
@@ -134956,8 +135796,8 @@ self: {
}:
mkDerivation {
pname = "katip";
- version = "0.8.1.0";
- sha256 = "1x03k700c59icr049685y0lpyqjg27mpm1z5g69zy3gh3b87sb0j";
+ version = "0.8.2.0";
+ sha256 = "064i2dbl52i2z7lyvk01ayvf6dzzn20bac3fwh0dlvr5bn49wran";
libraryHaskellDepends = [
aeson async auto-update base bytestring containers either hostname
microlens microlens-th monad-control mtl old-locale resourcet
@@ -135823,6 +136663,17 @@ self: {
broken = true;
}) {};
+ "key" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "key";
+ version = "0.1.1.0";
+ sha256 = "15n53kq13hhc659s1hq9wdr530da3h2mg5psncq1d2snkkdswqxf";
+ libraryHaskellDepends = [ base transformers ];
+ description = "Type-safe unconstrained dynamic typing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"key-state" = callPackage
({ mkDerivation, base, hspec }:
mkDerivation {
@@ -135852,6 +136703,8 @@ self: {
];
testHaskellDepends = [ base ];
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"keycode" = callPackage
@@ -136950,14 +137803,17 @@ self: {
}) {};
"lambda-options" = callPackage
- ({ mkDerivation, base, containers, mtl, read-bounded }:
+ ({ mkDerivation, base, containers, funspection, mtl, read-bounded
+ }:
mkDerivation {
pname = "lambda-options";
- version = "0.9.1.0";
- sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n";
- libraryHaskellDepends = [ base containers mtl read-bounded ];
- description = "Declarative command line parser using type-driven pattern matching";
- license = stdenv.lib.licenses.bsd2;
+ version = "1.0.0.0";
+ sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx";
+ libraryHaskellDepends = [
+ base containers funspection mtl read-bounded
+ ];
+ description = "Declarative command-line parser using type-driven pattern matching";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -137764,8 +138620,8 @@ self: {
}:
mkDerivation {
pname = "language-ats";
- version = "1.7.0.6";
- sha256 = "0d2bjha52jph49jiac045igpxarrksihvv46s047qigs435linck";
+ version = "1.7.1.1";
+ sha256 = "0zqvr8z0mdjjdd9wx3ghf4aiv61brs52wk04d2vqar8nvv2wpzn4";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array base composition-prelude containers deepseq
@@ -137903,6 +138759,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "language-c99" = callPackage
+ ({ mkDerivation, base, pretty }:
+ mkDerivation {
+ pname = "language-c99";
+ version = "0.1.1";
+ sha256 = "1a6n9n3jzplwgm6136rvhm6zmkvnhxz0nw1bfplikg8kkfgbp5al";
+ libraryHaskellDepends = [ base pretty ];
+ description = "An implementation of the C99 AST that strictly follows the standard";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "language-c99-simple" = callPackage
+ ({ mkDerivation, base, language-c99, language-c99-util, mtl }:
+ mkDerivation {
+ pname = "language-c99-simple";
+ version = "0.1.1";
+ sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic";
+ libraryHaskellDepends = [
+ base language-c99 language-c99-util mtl
+ ];
+ description = "C-like AST to simplify writing C99 programs";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "language-c99-util" = callPackage
+ ({ mkDerivation, base, language-c99 }:
+ mkDerivation {
+ pname = "language-c99-util";
+ version = "0.1.1";
+ sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz";
+ libraryHaskellDepends = [ base language-c99 ];
+ description = "Utilities for language-c99";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"language-cil" = callPackage
({ mkDerivation, base, bool-extras }:
mkDerivation {
@@ -137973,8 +138864,8 @@ self: {
}:
mkDerivation {
pname = "language-docker";
- version = "8.0.1";
- sha256 = "0wmnwsf2avdygd3mnz9bd53hlmasgh6cbmzxir2b2ycnp21a1ily";
+ version = "8.0.2";
+ sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij";
libraryHaskellDepends = [
base bytestring containers free megaparsec mtl prettyprinter split
template-haskell text th-lift time
@@ -140352,8 +141243,8 @@ self: {
pname = "lens-properties";
version = "4.11.1";
sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
- revision = "2";
- editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482";
+ revision = "3";
+ editedCabalFile = "1ll8j0zymxnr2xxp2h1aaqfcwd6ihjdllk5b7q02r5kw2b8a266b";
libraryHaskellDepends = [ base lens QuickCheck transformers ];
description = "QuickCheck properties for lens";
license = stdenv.lib.licenses.bsd3;
@@ -140539,10 +141430,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.1.1.1";
- sha256 = "00ydjvvpqil044wjb52cf804qn8fdqvf3rn3jghinb10y8i4a62k";
- revision = "1";
- editedCabalFile = "1vamkgjrngsdq8k820xkr0h613ly2s3lpf0hdqkvqkynywmd2ing";
+ version = "1.1.2.0";
+ sha256 = "1zhn8wpm1hd50j0nc776d9f3jq46lk5d62srrd66abfkvqxfxw6b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -140582,8 +141471,8 @@ self: {
pname = "lenz-template";
version = "0.2.0.0";
sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
- revision = "2";
- editedCabalFile = "0vd1xir15fizd2j575lgbr99gdm83n998w645cr0pzv3li6a56jq";
+ revision = "3";
+ editedCabalFile = "1ydlnn3cppjr3c0ink0k0668dmxk057gild2k84j8f27hcyb0w2j";
libraryHaskellDepends = [
base base-unicode-symbols containers lenz template-haskell
];
@@ -140891,13 +141780,18 @@ self: {
}) {};
"libarchive" = callPackage
- ({ mkDerivation, base, bytestring, filepath, libarchive }:
+ ({ mkDerivation, base, bytestring, c2hs, composition-prelude, dlist
+ , filepath, libarchive
+ }:
mkDerivation {
pname = "libarchive";
- version = "0.2.1.2";
- sha256 = "1fwiwfqknndfnq55psdbj2swf1y5cm971lah4dgayg8vn76n961x";
- libraryHaskellDepends = [ base bytestring filepath ];
+ version = "1.0.5.0";
+ sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r";
+ libraryHaskellDepends = [
+ base bytestring composition-prelude dlist filepath
+ ];
libraryPkgconfigDepends = [ libarchive ];
+ libraryToolDepends = [ c2hs ];
description = "Haskell interface to libarchive";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libarchive;};
@@ -141398,46 +142292,51 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "libraft_0_4_1_0" = callPackage
+ "libraft_0_5_0_0" = callPackage
({ mkDerivation, async, atomic-write, attoparsec, base
, base16-bytestring, bytestring, cereal, concurrency, containers
- , cryptohash-sha256, dejafu, directory, exceptions, file-embed
- , haskeline, hunit-dejafu, lifted-base, monad-control, mtl, network
- , network-simple, parsec, postgresql-simple, process, protolude
- , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty
- , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit
- , tasty-quickcheck, text, time, transformers, transformers-base
- , tree-diff, word8
+ , cryptohash-sha256, dejafu, directory, ekg, ekg-core, exceptions
+ , file-embed, filepath, haskeline, lifted-base, monad-control
+ , monad-metrics, mtl, network, network-simple, optparse-applicative
+ , parsec, postgresql-simple, postgresql-simple-url, process
+ , protolude, QuickCheck, quickcheck-state-machine, random, repline
+ , stm, tasty, tasty-dejafu, tasty-discover, tasty-expected-failure
+ , tasty-hunit, tasty-quickcheck, text, time, transformers
+ , transformers-base, tree-diff, unordered-containers, word8
}:
mkDerivation {
pname = "libraft";
- version = "0.4.1.0";
- sha256 = "03f76ysn1r8nvxzd21lrnhg1dy1fikq0jwbjz0x6z4w8q8vik38i";
+ version = "0.5.0.0";
+ sha256 = "13wk2dk0hs3ds5sa301v35i4g7frq1d7nj6c2957cbd9xwwyrksc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async atomic-write attoparsec base base16-bytestring bytestring
cereal concurrency containers cryptohash-sha256 dejafu directory
- exceptions file-embed haskeline lifted-base monad-control mtl
- network network-simple parsec postgresql-simple protolude random
- repline stm text time transformers transformers-base word8
+ ekg ekg-core exceptions file-embed filepath haskeline lifted-base
+ monad-control monad-metrics mtl network network-simple parsec
+ postgresql-simple protolude random repline stm text time
+ transformers transformers-base unordered-containers word8
];
executableHaskellDepends = [
async atomic-write attoparsec base base16-bytestring bytestring
cereal concurrency containers cryptohash-sha256 dejafu directory
- exceptions file-embed haskeline lifted-base monad-control mtl
- network network-simple parsec postgresql-simple protolude random
- repline stm text time transformers transformers-base word8
+ ekg ekg-core exceptions file-embed filepath haskeline lifted-base
+ monad-control monad-metrics mtl network network-simple
+ optparse-applicative parsec postgresql-simple postgresql-simple-url
+ protolude random repline stm text time transformers
+ transformers-base unordered-containers word8
];
testHaskellDepends = [
async atomic-write attoparsec base base16-bytestring bytestring
cereal concurrency containers cryptohash-sha256 dejafu directory
- exceptions file-embed haskeline hunit-dejafu lifted-base
- monad-control mtl network network-simple parsec postgresql-simple
- process protolude QuickCheck quickcheck-state-machine random
- repline stm tasty tasty-dejafu tasty-discover
- tasty-expected-failure tasty-hunit tasty-quickcheck text time
- transformers transformers-base tree-diff word8
+ ekg ekg-core exceptions file-embed filepath haskeline lifted-base
+ monad-control monad-metrics mtl network network-simple parsec
+ postgresql-simple process protolude QuickCheck
+ quickcheck-state-machine random repline stm tasty tasty-dejafu
+ tasty-discover tasty-expected-failure tasty-hunit tasty-quickcheck
+ text time transformers transformers-base tree-diff
+ unordered-containers word8
];
testToolDepends = [ tasty-discover ];
description = "Raft consensus algorithm";
@@ -143101,8 +144000,7 @@ self: {
doCheck = false;
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) git; inherit (pkgs) nettools;
inherit (pkgs) ocaml; inherit (pkgs) z3;};
@@ -143145,8 +144043,7 @@ self: {
testSystemDepends = [ z3 ];
description = "Liquid Types for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) z3;};
"liquidhaskell-cabal" = callPackage
@@ -145722,8 +146619,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "6";
- editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh";
+ revision = "7";
+ editedCabalFile = "0bwl2hpj0w1wg86az52iwz0afs1h99b599vdn0fgygw2ivhbvqjv";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -147208,8 +148105,8 @@ self: {
}:
mkDerivation {
pname = "main-tester";
- version = "0.2.0.0";
- sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc";
+ version = "0.2.0.1";
+ sha256 = "0hkqllckiq74mhnd76jd0cv5az6n0cf70xncy9r1jkip9s9za1ng";
libraryHaskellDepends = [ base bytestring directory ];
testHaskellDepends = [
base bytestring hspec hspec-core QuickCheck text
@@ -148516,6 +149413,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "massiv_0_3_0_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest
+ , containers, data-default, data-default-class, deepseq, doctest
+ , exceptions, hspec, primitive, QuickCheck, scheduler
+ , template-haskell, unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "massiv";
+ version = "0.3.0.0";
+ sha256 = "17hi5n8jg15kljnhbl3crqpkqfm4wj2rdz6r9fyqqh2ky8l50c6j";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq exceptions primitive
+ scheduler unliftio-core vector
+ ];
+ testHaskellDepends = [
+ async base bytestring containers data-default deepseq doctest hspec
+ QuickCheck scheduler template-haskell unliftio vector
+ ];
+ description = "Massiv (Массив) is an Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"massiv-io" = callPackage
({ mkDerivation, base, bytestring, data-default, deepseq, directory
, filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -148532,6 +149453,43 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "massiv-io_0_1_6_0" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, deepseq, directory
+ , filepath, JuicyPixels, massiv, netpbm, process, vector
+ }:
+ mkDerivation {
+ pname = "massiv-io";
+ version = "0.1.6.0";
+ sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn";
+ libraryHaskellDepends = [
+ base bytestring data-default deepseq directory filepath JuicyPixels
+ massiv netpbm process vector
+ ];
+ description = "Import/export of Image files into massiv Arrays";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "massiv-scheduler" = callPackage
+ ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
+ , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
+ , unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "massiv-scheduler";
+ version = "0.1.1.0";
+ sha256 = "1i2j1gapkpx4n7x2s3nnsmns55hl4nrk4csgxak05gnj66p938v3";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ atomic-primops base deepseq exceptions unliftio-core
+ ];
+ testHaskellDepends = [
+ base deepseq doctest hspec QuickCheck template-haskell unliftio
+ ];
+ description = "Work stealing scheduler for Massiv (Массив) and other parallel applications";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"master-plan" = callPackage
({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
, hspec, megaparsec, mtl, optparse-applicative, QuickCheck
@@ -148806,20 +149764,21 @@ self: {
"matplotlib" = callPackage
({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq
- , filepath, process, random, raw-strings-qq, split, tasty
- , tasty-expected-failure, tasty-golden, tasty-hunit, temporary
+ , directory, filepath, process, random, raw-strings-qq, split
+ , tasty, tasty-expected-failure, tasty-golden, tasty-hunit
+ , temporary
}:
mkDerivation {
pname = "matplotlib";
- version = "0.6.0";
- sha256 = "105rqbqpqgnsgqxvzqgp203bp4bckf35z7cncqg7nwypgf10ipvd";
+ version = "0.7.4";
+ sha256 = "0vpvi0iigmajz3dn0kx5kk9i7ccpbxs1f9fg4qymy3v18zd3wiqg";
libraryHaskellDepends = [
aeson base bytestring containers deepseq filepath process split
temporary
];
testHaskellDepends = [
- ad base bytestring process random raw-strings-qq split tasty
- tasty-expected-failure tasty-golden tasty-hunit temporary
+ ad base bytestring directory process random raw-strings-qq split
+ tasty tasty-expected-failure tasty-golden tasty-hunit temporary
];
description = "Bindings to Matplotlib; a Python plotting library";
license = stdenv.lib.licenses.bsd3;
@@ -149020,6 +149979,8 @@ self: {
];
description = "Terminal client for the Mattermost chat system";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"mattermost-api" = callPackage
@@ -150316,8 +151277,8 @@ self: {
}:
mkDerivation {
pname = "menshen";
- version = "0.0.1";
- sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw";
+ version = "0.0.2";
+ sha256 = "05z6vmxgxfsl4s5bsxrkd929mfml0yk51gwinhwv9c090f5yvbli";
libraryHaskellDepends = [ base regex-tdfa scientific text ];
testHaskellDepends = [
aeson base hspec QuickCheck regex-tdfa scientific text
@@ -150326,6 +151287,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "menshen_0_0_3" = callPackage
+ ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa
+ , scientific, text
+ }:
+ mkDerivation {
+ pname = "menshen";
+ version = "0.0.3";
+ sha256 = "0zx530ksb0zmczbl6k70xg6pxgr2wfga2pg0ghgmpgd9f307xrwb";
+ libraryHaskellDepends = [ base regex-tdfa scientific text ];
+ testHaskellDepends = [
+ aeson base hspec QuickCheck regex-tdfa scientific text
+ ];
+ description = "Data Validation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mercury-api" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
, hashable, HUnit, optparse-applicative, text, unordered-containers
@@ -154162,12 +155140,12 @@ self: {
}) {};
"monadacme" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, transformers }:
mkDerivation {
pname = "monadacme";
- version = "0.0.2";
- sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97";
- libraryHaskellDepends = [ base ];
+ version = "0.1.0.0";
+ sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr";
+ libraryHaskellDepends = [ base transformers ];
description = "The Acme and AcmeT monads";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -155075,6 +156053,58 @@ self: {
broken = true;
}) {morfeusz = null;};
+ "morley" = callPackage
+ ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
+ , base16-bytestring, base58-bytestring, bifunctors, bytestring
+ , containers, cryptonite, data-default, directory, filepath, fmt
+ , formatting, hspec, hspec-golden-aeson, HUnit, lens, megaparsec
+ , memory, morley-prelude, mtl, named, optparse-applicative
+ , parser-combinators, pretty-simple, QuickCheck
+ , quickcheck-arbitrary-adt, quickcheck-instances, singletons, text
+ , time, timerep, transformers-compat, universum, vinyl
+ }:
+ mkDerivation {
+ pname = "morley";
+ version = "0.1.0.5";
+ sha256 = "1ymkr805wmwd3vpsyjwbfwryvixz3lpl8g24ygsv1ipc4v3cvxj4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-options aeson-pretty base-noprelude base16-bytestring
+ base58-bytestring bifunctors bytestring containers cryptonite
+ data-default directory fmt formatting hspec lens megaparsec memory
+ morley-prelude mtl named parser-combinators QuickCheck singletons
+ text time timerep transformers-compat vinyl
+ ];
+ executableHaskellDepends = [
+ base-noprelude fmt megaparsec morley-prelude named
+ optparse-applicative pretty-simple text
+ ];
+ testHaskellDepends = [
+ aeson base-noprelude containers directory filepath fmt formatting
+ hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude
+ QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time
+ universum vinyl
+ ];
+ description = "Developer tools for the Michelson Language";
+ license = stdenv.lib.licenses.agpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "morley-prelude" = callPackage
+ ({ mkDerivation, base-noprelude, universum }:
+ mkDerivation {
+ pname = "morley-prelude";
+ version = "0.1.0.3";
+ sha256 = "0rrh3zdrdyxi8hhf4iw6rxgz4cfbfm25a906k9lfxlp668nbn2si";
+ libraryHaskellDepends = [ base-noprelude universum ];
+ description = "A custom prelude used in Morley";
+ license = stdenv.lib.licenses.agpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"morph" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
, optparse-applicative, postgresql-simple, text, yaml
@@ -155689,23 +156719,20 @@ self: {
}) {};
"msgpack" = callPackage
- ({ mkDerivation, base, binary, blaze-builder, bytestring
- , containers, data-binary-ieee754, deepseq, hashable, mtl
- , QuickCheck, tasty, tasty-quickcheck, text, unordered-containers
- , vector
+ ({ mkDerivation, async, base, binary, bytestring, containers
+ , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty
+ , tasty-quickcheck, text, unordered-containers, vector
}:
mkDerivation {
pname = "msgpack";
- version = "1.0.0";
- sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8";
- revision = "1";
- editedCabalFile = "0fg5hragvpil7212w7pyyiws0zlf4imas9sjj235lb1wjpka52qp";
+ version = "1.0.1.0";
+ sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77";
libraryHaskellDepends = [
- base binary blaze-builder bytestring containers data-binary-ieee754
- deepseq hashable mtl text unordered-containers vector
+ base binary bytestring containers data-binary-ieee754 deepseq
+ hashable mtl text unordered-containers vector
];
testHaskellDepends = [
- base bytestring QuickCheck tasty tasty-quickcheck
+ async base bytestring QuickCheck tasty tasty-quickcheck
];
description = "A Haskell implementation of MessagePack";
license = stdenv.lib.licenses.bsd3;
@@ -155765,6 +156792,8 @@ self: {
pname = "msgpack-rpc";
version = "1.0.0";
sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn";
+ revision = "2";
+ editedCabalFile = "10vhvch66vk12gxgvivzz7x829ml8v08qcw9phylf4icwrgirn0p";
libraryHaskellDepends = [
base binary binary-conduit bytestring conduit conduit-extra
exceptions monad-control msgpack mtl network random text
@@ -158179,6 +159208,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "named_0_3_0_0" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "named";
+ version = "0.3.0.0";
+ sha256 = "03pg2xdx86c7ns8p04gn8l4nwpjx538545f0fjq0j3mlhn09qrh7";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Named parameters (keyword arguments) for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"named-formlet" = callPackage
({ mkDerivation, base, blaze-html, bytestring, containers, mtl
, text, transformers
@@ -159479,10 +160521,8 @@ self: {
}:
mkDerivation {
pname = "netpbm";
- version = "1.0.2";
- sha256 = "1my2zi26wspzh0pplfhgwj9vmkv41hwvrzl8k1virqsbm6y08sl4";
- revision = "1";
- editedCabalFile = "1vhwjv5c5gxn9l9982da54nzczbmj8rl09xn8ac7rix0zmmyvl50";
+ version = "1.0.3";
+ sha256 = "17cxh15wf7m9ljg0scd5i71ki95fiz8qhrfk4w1zvk4pf2gb7z38";
libraryHaskellDepends = [
attoparsec attoparsec-binary base bytestring storable-record
unordered-containers vector vector-th-unbox
@@ -159759,15 +160799,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "network_3_0_1_0" = callPackage
+ "network_3_0_1_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, hspec
- , hspec-discover, HUnit, unix
+ , hspec-discover, HUnit
}:
mkDerivation {
pname = "network";
- version = "3.0.1.0";
- sha256 = "1dk1dabj779sppjl8vbi4kw8l5da5yfc7x5yn0mjy9zrzlfwqq3l";
- libraryHaskellDepends = [ base bytestring deepseq unix ];
+ version = "3.0.1.1";
+ sha256 = "1xacvl5wf47cz61igb94zf961b9ks0yhr02myxgjf53clm70dg6j";
+ libraryHaskellDepends = [ base bytestring deepseq ];
testHaskellDepends = [ base bytestring directory hspec HUnit ];
testToolDepends = [ hspec-discover ];
description = "Low-level networking interface";
@@ -159936,6 +160976,8 @@ self: {
pname = "network-bsd";
version = "2.8.1.0";
sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr";
+ revision = "1";
+ editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar";
libraryHaskellDepends = [ base deepseq network ];
description = "POSIX network database () API";
license = stdenv.lib.licenses.bsd3;
@@ -160725,12 +161767,12 @@ self: {
}) {};
"network-uri-lenses" = callPackage
- ({ mkDerivation, base, lens, network-uri }:
+ ({ mkDerivation, base, network-uri }:
mkDerivation {
pname = "network-uri-lenses";
- version = "0.2.0.0";
- sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p";
- libraryHaskellDepends = [ base lens network-uri ];
+ version = "0.2.1.0";
+ sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w";
+ libraryHaskellDepends = [ base network-uri ];
description = "Lenses for network-uri";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -160897,6 +161939,39 @@ self: {
broken = true;
}) {inherit (pkgs) blas;};
+ "newhope" = callPackage
+ ({ mkDerivation, AES, base, bytestring, containers, deepseq, hspec
+ , HUnit, mtl, parallel, QuickCheck, raw-strings-qq, statistics
+ , system-fileio, system-filepath, tasty, tasty-expected-failure
+ , tasty-hunit, tasty-quickcheck, text, trifecta, vector
+ }:
+ mkDerivation {
+ pname = "newhope";
+ version = "0.1.0.0";
+ sha256 = "1yqxdir74mdi2dkccl1wcr2xzxrvg6y8ssskdq0laxb3q8xyzpwa";
+ revision = "1";
+ editedCabalFile = "18508knx0m46k9wpcxdvb1kahg5vrqc734ifwam9q5kljpm9l0sy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ AES base bytestring containers deepseq mtl vector
+ ];
+ executableHaskellDepends = [
+ AES base bytestring containers deepseq mtl system-fileio
+ system-filepath tasty-quickcheck text vector
+ ];
+ testHaskellDepends = [
+ AES base bytestring containers deepseq hspec HUnit mtl parallel
+ QuickCheck raw-strings-qq statistics system-fileio system-filepath
+ tasty tasty-expected-failure tasty-hunit tasty-quickcheck text
+ trifecta vector
+ ];
+ description = "Library implementing the NewHope cryptographic key-exchange protocol";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"newports" = callPackage
({ mkDerivation, base, directory, old-time }:
mkDerivation {
@@ -161290,12 +162365,12 @@ self: {
}) {};
"nimber" = callPackage
- ({ mkDerivation, arithmoi, base }:
+ ({ mkDerivation, base, integer-logarithms }:
mkDerivation {
pname = "nimber";
- version = "0.1.3";
- sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w";
- libraryHaskellDepends = [ arithmoi base ];
+ version = "0.1.4";
+ sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj";
+ libraryHaskellDepends = [ base integer-logarithms ];
description = "Finite nimber arithmetic";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -163582,8 +164657,8 @@ self: {
}:
mkDerivation {
pname = "ocaml-export";
- version = "0.9.0.0";
- sha256 = "1wqgvaf8198p1avq3vlmi256a6wk5w76m4hvlhvmdv0kzad3iw25";
+ version = "0.13.0";
+ sha256 = "1pfy648qrx7s0qmli9cjs0c0bnnvirilicaydy08zj3w4rvjfdb4";
libraryHaskellDepends = [
aeson base bytestring containers directory file-embed filepath
formatting hspec hspec-golden-aeson mtl QuickCheck
@@ -165957,8 +167032,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "ordered-containers";
- version = "0.1.1";
- sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a";
+ version = "0.2.1";
+ sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01";
libraryHaskellDepends = [ base containers ];
description = "Set- and Map-like types that remember the order elements were inserted";
license = stdenv.lib.licenses.bsd3;
@@ -166068,21 +167143,22 @@ self: {
({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes
, bytestring, colour, containers, data-default, diagrams-lib
, diagrams-svg, directory, exceptions, filepath, fmt, formatting
- , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple
- , orgmode-parse, QuickCheck, quickcheck-text, text, time
- , transformers, turtle, universum, yaml
+ , hashable, hspec, HUnit, lens, mtl, optparse-simple, orgmode-parse
+ , process, QuickCheck, quickcheck-text, text, time, transformers
+ , turtle, universum, yaml
}:
mkDerivation {
pname = "orgstat";
- version = "0.1.5";
- sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz";
+ version = "0.1.6";
+ sha256 = "1w6nbgq29bdx0skqsy7h46x46g6rzpsgp2n5ldxv2nmbwbhq6bib";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal attoparsec base boxes bytestring colour
containers data-default diagrams-lib diagrams-svg directory
- exceptions filepath fmt formatting hashable lens linear mtl
- optparse-simple orgmode-parse text time turtle universum yaml
+ exceptions filepath fmt formatting hashable lens mtl
+ optparse-simple orgmode-parse process text time turtle universum
+ yaml
];
executableHaskellDepends = [
base bytestring directory exceptions filepath formatting
@@ -167434,25 +168510,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pandoc-pyplot_1_1_0_0" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, hspec
- , hspec-expectations, pandoc-types, tasty, tasty-hspec, tasty-hunit
- , temporary, typed-process
+ "pandoc-pyplot_2_0_0_0" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, hashable
+ , hspec, hspec-expectations, pandoc-types, random, tasty
+ , tasty-hspec, tasty-hunit, temporary, text, typed-process
}:
mkDerivation {
pname = "pandoc-pyplot";
- version = "1.1.0.0";
- sha256 = "0c04ayg4rnlycsw16gafiwvixxwc66wxfm4nk25bclbl67zyw8qj";
+ version = "2.0.0.0";
+ sha256 = "0mh934ab65fbncva9nmgs8mifsjkh57ay952wl5rn9s6037fj5m5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers directory filepath pandoc-types temporary
- typed-process
+ base containers directory filepath hashable pandoc-types random
+ temporary text typed-process
];
executableHaskellDepends = [ base pandoc-types ];
testHaskellDepends = [
base directory filepath hspec hspec-expectations pandoc-types tasty
- tasty-hspec tasty-hunit temporary
+ tasty-hspec tasty-hunit temporary text
];
description = "A Pandoc filter for including figures generated from Matplotlib";
license = stdenv.lib.licenses.mit;
@@ -167500,6 +168576,8 @@ self: {
pname = "pandoc-types";
version = "1.17.5.4";
sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j";
+ revision = "1";
+ editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c";
libraryHaskellDepends = [
aeson base bytestring containers deepseq ghc-prim QuickCheck syb
transformers
@@ -168913,8 +169991,8 @@ self: {
}:
mkDerivation {
pname = "parsix";
- version = "0.1.0.3";
- sha256 = "0b3lzdyr2zbj4rnqkk4nxg2ix2ymvy3cfa7rqay31k637v441c75";
+ version = "0.1.0.4";
+ sha256 = "0ay3a07sj52r413s921519crvd3kf7i4zdmpqy6k1spzqnwzc9nc";
libraryHaskellDepends = [
base containers fingertree mtl parsers prettyprinter
prettyprinter-ansi-terminal text transformers
@@ -169178,6 +170256,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "password" = callPackage
+ ({ mkDerivation, base, doctest, QuickCheck, quickcheck-instances
+ , scrypt, text
+ }:
+ mkDerivation {
+ pname = "password";
+ version = "0.1.0.0";
+ sha256 = "097zpb3brl7qib2a7di4y5lpkgzyqanhcyfchpf1xng199k2bwp3";
+ libraryHaskellDepends = [ base scrypt text ];
+ testHaskellDepends = [
+ base doctest QuickCheck quickcheck-instances
+ ];
+ description = "plain-text password and hashed password datatypes and functions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "password-instances" = callPackage
+ ({ mkDerivation, aeson, base, doctest, http-api-data, password
+ , persistent, QuickCheck, quickcheck-instances
+ }:
+ mkDerivation {
+ pname = "password-instances";
+ version = "0.3.0.0";
+ sha256 = "1ll5c9dpw23v4r3zf3v7rc6y5cjh55myjdg5mvyi1d5kb95pbwp9";
+ libraryHaskellDepends = [
+ aeson base http-api-data password persistent
+ ];
+ testHaskellDepends = [
+ base doctest QuickCheck quickcheck-instances
+ ];
+ description = "typeclass instances for password package";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"passwords" = callPackage
({ mkDerivation, base, containers, MonadRandom, random }:
mkDerivation {
@@ -169541,6 +170653,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pattern-matcher" = callPackage
+ ({ mkDerivation, base, containers, mtl, QuickCheck }:
+ mkDerivation {
+ pname = "pattern-matcher";
+ version = "0.1.0.0";
+ sha256 = "03adnzwcpc2mqqvfd2akiln0pfq6fn451an8vwxgx9gff0y85x5q";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base containers mtl QuickCheck ];
+ description = "A library for compiling pattern-matching to decision trees";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pattern-trie" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, deepseq
, doctest, hashable, mtl, QuickCheck, tasty, tasty-quickcheck, text
@@ -171325,18 +172449,19 @@ self: {
}) {};
"persistent-relational-record" = callPackage
- ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl
- , persistable-record, persistent, persistent-template
- , relational-query, resourcet, template-haskell, test-framework
- , test-framework-hunit, test-framework-th, text, time
+ ({ mkDerivation, array, base, conduit, containers, hlint, HUnit
+ , mtl, names-th, persistable-record, persistent
+ , persistent-template, relational-query, resourcet
+ , template-haskell, test-framework, test-framework-hunit
+ , test-framework-th, text, time
}:
mkDerivation {
pname = "persistent-relational-record";
- version = "0.1.2.0";
- sha256 = "1xbrkf7vw872hxk6g7bv4c5hx0708x6sqf38a4qm0m9bf2qiakgd";
+ version = "0.3.0";
+ sha256 = "0cbm9klj9z7lrkp8b9s3z6ij1apbmjxqmxaakmykz1fqc483h9g1";
libraryHaskellDepends = [
- base conduit containers mtl persistable-record persistent
- relational-query resourcet template-haskell text
+ array base conduit containers mtl names-th persistable-record
+ persistent relational-query resourcet template-haskell text
];
testHaskellDepends = [
base hlint HUnit persistent-template relational-query
@@ -172510,8 +173635,8 @@ self: {
({ mkDerivation, base, unix }:
mkDerivation {
pname = "pidfile";
- version = "0.1.0.3";
- sha256 = "12m477kinanyxi5612wz0n72qb0cymjb2x9pp0ggsngfpkqzp1j6";
+ version = "0.1.0.4";
+ sha256 = "0z0k923gb0b01r35x1qp4i1743mcn84cj3m12ss7jbxql768jigf";
libraryHaskellDepends = [ base unix ];
description = "Run an IO action protected by a pidfile";
license = stdenv.lib.licenses.bsd3;
@@ -175018,8 +176143,8 @@ self: {
}:
mkDerivation {
pname = "pointfree-fancy";
- version = "1.1.1.11";
- sha256 = "0kxk9kxqlxl0j1cq5jvcsgcfggc3xz0qi7a1qw6w1l83gs2vjjrk";
+ version = "1.1.1.12";
+ sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -178372,8 +179497,8 @@ self: {
}:
mkDerivation {
pname = "primitive-containers";
- version = "0.3.1";
- sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3";
+ version = "0.3.3";
+ sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza";
libraryHaskellDepends = [
aeson base contiguous deepseq hashable primitive primitive-sort
quantification text unordered-containers vector
@@ -180823,22 +181948,26 @@ self: {
}) {};
"publish" = callPackage
- ({ mkDerivation, base, bytestring, chronologique, directory
- , filepath, hinotify, pandoc, pandoc-types, template-haskell, text
- , typed-process, unbeliever, unix, unordered-containers
+ ({ mkDerivation, base, bytestring, chronologique, deepseq
+ , directory, filepath, hinotify, hspec, pandoc, pandoc-types
+ , template-haskell, text, typed-process, unbeliever, unix
+ , unordered-containers
}:
mkDerivation {
pname = "publish";
- version = "0.3.2";
- sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l";
- revision = "1";
- editedCabalFile = "136hi1c3ap2dvhn79dqdn29dfq5ncilg6qap41d0wf4jp7p419a8";
+ version = "0.4.4";
+ sha256 = "1a75pqz9gvzda70182gvfwjjzsrqdspngj00mlma1ayr9jy4sxr4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring chronologique directory filepath hinotify pandoc
- pandoc-types template-haskell text typed-process unbeliever unix
- unordered-containers
+ base bytestring chronologique deepseq directory filepath hinotify
+ pandoc pandoc-types template-haskell text typed-process unbeliever
+ unix unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring chronologique deepseq directory filepath hinotify
+ hspec pandoc pandoc-types template-haskell text typed-process
+ unbeliever unix unordered-containers
];
description = "Publishing tools for papers, books, and presentations";
license = stdenv.lib.licenses.bsd3;
@@ -182852,6 +183981,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "quickcheck-instances_0_3_20" = callPackage
+ ({ mkDerivation, array, base, base-compat, bytestring
+ , case-insensitive, containers, hashable, old-time, QuickCheck
+ , scientific, splitmix, tagged, text, time, transformers
+ , transformers-compat, unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "quickcheck-instances";
+ version = "0.3.20";
+ sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya";
+ libraryHaskellDepends = [
+ array base base-compat bytestring case-insensitive containers
+ hashable old-time QuickCheck scientific splitmix tagged text time
+ transformers transformers-compat unordered-containers uuid-types
+ vector
+ ];
+ testHaskellDepends = [
+ base containers QuickCheck tagged uuid-types
+ ];
+ benchmarkHaskellDepends = [ base bytestring QuickCheck ];
+ description = "Common quickcheck instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"quickcheck-io" = callPackage
({ mkDerivation, base, HUnit, QuickCheck }:
mkDerivation {
@@ -183177,11 +184331,13 @@ self: {
({ mkDerivation, base, QuickCheck, template-haskell }:
mkDerivation {
pname = "quickcheck-with-counterexamples";
- version = "1.1";
- sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd";
+ version = "1.2";
+ sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg";
libraryHaskellDepends = [ base QuickCheck template-haskell ];
description = "Get counterexamples from QuickCheck as Haskell values";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"quicklz" = callPackage
@@ -183603,8 +184759,8 @@ self: {
}:
mkDerivation {
pname = "raaz";
- version = "0.2.0";
- sha256 = "0841p4yw0hd1mjx0ida662n6apfhmjyw76ar9gaysivbgh75dw4y";
+ version = "0.2.1";
+ sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring deepseq vector ];
@@ -185114,10 +186270,8 @@ self: {
}:
mkDerivation {
pname = "raw-feldspar";
- version = "0.2.1";
- sha256 = "1z2qk62p6bjcj5p7r9xdc992cacdi9f5bwxzrxiqz3m3zj7qn63w";
- revision = "1";
- editedCabalFile = "1y7n3l959ydvwypb27vdkkkgfglk2jwkjblnq8kqn3540jl7qfhr";
+ version = "0.3";
+ sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w";
libraryHaskellDepends = [
array base constraints containers data-default-class data-hash
imperative-edsl language-c-quote mtl operational-alacarte
@@ -185873,8 +187027,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "read-bounded";
- version = "0.1.1.1";
- sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx";
+ version = "0.1.1.2";
+ sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg";
libraryHaskellDepends = [ base ];
description = "Class for reading bounded values";
license = stdenv.lib.licenses.bsd3;
@@ -186149,6 +187303,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rebase_1_3_1" = callPackage
+ ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+ , containers, contravariant, contravariant-extras, deepseq, dlist
+ , either, fail, hashable, mtl, profunctors, scientific
+ , semigroupoids, semigroups, stm, text, time, transformers
+ , unordered-containers, uuid, vector, void
+ }:
+ mkDerivation {
+ pname = "rebase";
+ version = "1.3.1";
+ sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4";
+ libraryHaskellDepends = [
+ base base-prelude bifunctors bytestring containers contravariant
+ contravariant-extras deepseq dlist either fail hashable mtl
+ profunctors scientific semigroupoids semigroups stm text time
+ transformers unordered-containers uuid vector void
+ ];
+ description = "A more progressive alternative to the \"base\" package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rebindable" = callPackage
({ mkDerivation, base, data-default-class, indexed }:
mkDerivation {
@@ -186221,6 +187397,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "record-dot-preprocessor_0_2" = callPackage
+ ({ mkDerivation, base, extra, filepath, ghc, record-hasfield
+ , uniplate
+ }:
+ mkDerivation {
+ pname = "record-dot-preprocessor";
+ version = "0.2";
+ sha256 = "1k2bdinvygn00l12am5n8m2i3vqp6h555mcj6d8xshy320v85np8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base extra ghc uniplate ];
+ executableHaskellDepends = [ base extra ];
+ testHaskellDepends = [ base extra filepath record-hasfield ];
+ description = "Preprocessor to allow record.field syntax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"record-encode" = callPackage
({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck
, vector
@@ -186264,6 +187458,18 @@ self: {
broken = true;
}) {};
+ "record-hasfield" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "record-hasfield";
+ version = "1.0";
+ sha256 = "1jlyhj4nlj4hrypdcv7393nccjmfjnh1311incgqhm5wzigjygaj";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "A version of GHC.Records as available in future GHCs.";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"record-preprocessor" = callPackage
({ mkDerivation, base, base-prelude, basic-lens, conversion
, conversion-text, record, record-syntax, text
@@ -186310,6 +187516,18 @@ self: {
broken = true;
}) {};
+ "record-wrangler" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "record-wrangler";
+ version = "0.1.1.0";
+ sha256 = "1lxbmb73k2ah663na2r7rgj6gxa6z971f6k8gcjbkbf095di1xlc";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base ];
+ description = "Alter your records with ease";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"records" = callPackage
({ mkDerivation, base, kinds, type-functions }:
mkDerivation {
@@ -186878,16 +188096,16 @@ self: {
}) {};
"refined" = callPackage
- ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter
- , template-haskell, transformers
+ ({ mkDerivation, aeson, base, deepseq, exceptions, mtl
+ , prettyprinter, QuickCheck, template-haskell, these, transformers
}:
mkDerivation {
pname = "refined";
- version = "0.3.0.0";
- sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks";
+ version = "0.4";
+ sha256 = "1cq06zlrfk2rbpbwxqqybqs5474gfvgx1dmqvzriha7zmd68wcx2";
libraryHaskellDepends = [
- base deepseq exceptions mtl prettyprinter template-haskell
- transformers
+ aeson base deepseq exceptions mtl prettyprinter QuickCheck
+ template-haskell these transformers
];
description = "Refinement types with static and runtime checking";
license = stdenv.lib.licenses.mit;
@@ -186942,19 +188160,19 @@ self: {
, monoidal-containers, mtl, prim-uniq, primitive, process, random
, ref-tf, reflection, semigroupoids, semigroups, split, stm, syb
, template-haskell, these, time, transformers, transformers-compat
- , unbounded-delays
+ , unbounded-delays, witherable
}:
mkDerivation {
pname = "reflex";
- version = "0.5.0.1";
- sha256 = "0al49xxy8zr28v0c9crjwp8khkrm04sbcq98dgkf8c95fi2mrxnb";
+ version = "0.6.1";
+ sha256 = "1ggp2bpil2ig6rs45fn754kpqnp45lp069nc6ib4isj0dgzb9gpn";
libraryHaskellDepends = [
base bifunctors comonad containers data-default dependent-map
dependent-sum exception-transformers haskell-src-exts
haskell-src-meta lens MemoTrie monad-control monoidal-containers
mtl prim-uniq primitive random ref-tf reflection semigroupoids
semigroups stm syb template-haskell these time transformers
- transformers-compat unbounded-delays
+ transformers-compat unbounded-delays witherable
];
testHaskellDepends = [
base bifunctors containers deepseq dependent-map dependent-sum
@@ -186989,14 +188207,34 @@ self: {
broken = true;
}) {};
+ "reflex-basic-host" = callPackage
+ ({ mkDerivation, base, dependent-map, dependent-sum, mtl, primitive
+ , ref-tf, reflex, stm
+ }:
+ mkDerivation {
+ pname = "reflex-basic-host";
+ version = "0.1";
+ sha256 = "0fxd46i6jp71dcdmgl1r5hbd9a85fkl5bxhi0dr1gzhy1b9aqc1g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base dependent-map dependent-sum mtl primitive ref-tf reflex stm
+ ];
+ executableHaskellDepends = [ base mtl reflex ];
+ description = "A basic `reflex` host for backend work";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"reflex-dom" = callPackage
({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex
, reflex-dom-core, text
}:
mkDerivation {
pname = "reflex-dom";
- version = "0.4";
- sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z";
+ version = "0.5";
+ sha256 = "167yghrwf6fay03y46xf87p9bhr6s3rlxn0yk5vnx1s5i95ps1x5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187045,35 +188283,42 @@ self: {
"reflex-dom-core" = callPackage
({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
- , bytestring, constraints, containers, contravariant, data-default
- , dependent-map, dependent-sum, dependent-sum-template, directory
- , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp
- , keycode, lens, linux-namespaces, monad-control, mtl, network-uri
- , primitive, process, ref-tf, reflex, semigroups, stm
- , template-haskell, temporary, text, these, transformers, unix
- , zenc
+ , bytestring, chrome-test-utils, constraints, constraints-extras
+ , containers, contravariant, data-default, dependent-map
+ , dependent-sum, dependent-sum-template, directory
+ , exception-transformers, exceptions, filepath, ghcjs-dom, hlint
+ , hspec, hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp
+ , keycode, lens, lifted-base, monad-control, mtl, network
+ , network-uri, primitive, process, random, ref-tf, reflex
+ , semigroups, silently, stm, template-haskell, temporary, text
+ , these, transformers, unix, wai, wai-websockets, warp, webdriver
+ , websockets, zenc
}:
mkDerivation {
pname = "reflex-dom-core";
- version = "0.4";
- sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv";
+ version = "0.5";
+ sha256 = "1vzlrqgl48krvm58w4mg5s3xwyc565rgjy7f2g1rxxljr30z95p4";
libraryHaskellDepends = [
aeson base bifunctors bimap blaze-builder bytestring constraints
containers contravariant data-default dependent-map dependent-sum
dependent-sum-template directory exception-transformers ghcjs-dom
- jsaddle keycode lens monad-control mtl network-uri primitive ref-tf
- reflex semigroups stm template-haskell text these transformers unix
- zenc
+ jsaddle keycode lens monad-control mtl network-uri primitive random
+ ref-tf reflex semigroups stm template-haskell text these
+ transformers unix zenc
];
testHaskellDepends = [
- base hlint jsaddle jsaddle-warp linux-namespaces process reflex
- temporary unix
+ aeson base bytestring chrome-test-utils constraints
+ constraints-extras containers dependent-map dependent-sum
+ dependent-sum-template directory exceptions filepath ghcjs-dom
+ hlint hspec hspec-webdriver http-types HUnit jsaddle jsaddle-warp
+ lens lifted-base network process random ref-tf reflex silently
+ temporary text wai wai-websockets warp webdriver websockets
];
description = "Functional Reactive Web Apps with Reflex";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {chrome-test-utils = null;};
"reflex-dom-fragment-shader-canvas" = callPackage
({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens
@@ -187196,15 +188441,15 @@ self: {
}:
mkDerivation {
pname = "reflex-sdl2";
- version = "0.2.0.0";
- sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw";
+ version = "0.3.0.0";
+ sha256 = "1mjynfdxnjdd308jp2gcpl8x00pmzshm81ramls7hzmkkvfm2xdb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async base containers dependent-sum exception-transformers mtl
primitive ref-tf reflex sdl2 stm
];
- executableHaskellDepends = [ base ];
+ executableHaskellDepends = [ base mtl reflex ];
description = "SDL2 and reflex FRP";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -188076,6 +189321,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "registry_0_1_3_1" = callPackage
+ ({ mkDerivation, async, base, containers, exceptions, generic-lens
+ , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl
+ , multimap, protolude, random, resourcet, semigroupoids, semigroups
+ , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell
+ , text, transformers-base, universum
+ }:
+ mkDerivation {
+ pname = "registry";
+ version = "0.1.3.1";
+ sha256 = "0qwylp0ajmpz17qiah8cpp6c4jl9bc9040vkm0v45afg0paanp7i";
+ libraryHaskellDepends = [
+ base containers exceptions hashable mtl protolude resourcet
+ semigroupoids semigroups template-haskell text transformers-base
+ ];
+ testHaskellDepends = [
+ async base containers exceptions generic-lens hashable hedgehog
+ hedgehog-corpus io-memoize MonadRandom mtl multimap protolude
+ random resourcet semigroupoids semigroups tasty tasty-discover
+ tasty-hedgehog tasty-th template-haskell text transformers-base
+ universum
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "data structure for assembling components";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regress" = callPackage
({ mkDerivation, ad, base, vector }:
mkDerivation {
@@ -188503,6 +189776,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "relude_0_5_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm
+ , tasty, tasty-hedgehog, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "relude";
+ version = "0.5.0";
+ sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq ghc-prim hashable mtl stm text
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring doctest Glob hedgehog QuickCheck tasty
+ tasty-hedgehog text
+ ];
+ benchmarkHaskellDepends = [
+ base containers gauge unordered-containers
+ ];
+ description = "Custom prelude from Kowainik";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"remark" = callPackage
({ mkDerivation, base, GenericPretty, tasty, tasty-golden
, tasty-hunit
@@ -189508,6 +190806,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rerebase_1_3_1" = callPackage
+ ({ mkDerivation, rebase }:
+ mkDerivation {
+ pname = "rerebase";
+ version = "1.3.1";
+ sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y";
+ libraryHaskellDepends = [ rebase ];
+ description = "Reexports from \"base\" with a bunch of other standard libraries";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reroute" = callPackage
({ mkDerivation, base, criterion, deepseq, graph-core, hashable
, hspec, http-api-data, hvect, mtl, random, regex-compat, text
@@ -193194,8 +194504,8 @@ self: {
}:
mkDerivation {
pname = "safe-money";
- version = "0.7";
- sha256 = "1cwha4s0dckdb7xrh1snxrismzr5gq586l9vmih9gmy2nrrw69y9";
+ version = "0.8.1";
+ sha256 = "0yncqrdawf0p7y9qrcz6mc2xd265r3w5kj9lzwqybid8xqbaclij";
libraryHaskellDepends = [
base binary constraints deepseq hashable QuickCheck text
vector-space
@@ -193216,8 +194526,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-aeson";
- version = "0.1";
- sha256 = "0qifhkyjgxfnfmbmysc4ma3hvyi2l0c238c75wlf5x1hz8q1ka8p";
+ version = "0.1.1";
+ sha256 = "1m8wwgxz632l5palqzjigk34c62qkbhqdy36wfnj50vh3d675c23";
libraryHaskellDepends = [ aeson base safe-money text ];
testHaskellDepends = [
aeson base bytestring safe-money tasty tasty-hunit tasty-quickcheck
@@ -193235,8 +194545,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-cereal";
- version = "0.1";
- sha256 = "02bzl1r4vymnb0xyagzrcgb2kxr892wivyasp7dkn41shgafaqzb";
+ version = "0.1.1";
+ sha256 = "0ppsaryp1pzbikjf3v5v73gjy8dg3h73yk72xcm3xmhna4msvia4";
libraryHaskellDepends = [ base cereal safe-money ];
testHaskellDepends = [
base bytestring cereal safe-money tasty tasty-hunit
@@ -193254,8 +194564,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-serialise";
- version = "0.1";
- sha256 = "16h8yf622szzc3v5xa2s7fsjaxk7cx9hqngjn796sdcg681g7xf5";
+ version = "0.1.1";
+ sha256 = "1v3pqsnjid6fyxr7ybxdyn6f4c3z9kh2s1f3hh75q5adgw80pbp6";
libraryHaskellDepends = [ base bytestring safe-money serialise ];
testHaskellDepends = [
base bytestring safe-money serialise tasty tasty-hunit
@@ -193273,8 +194583,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-store";
- version = "0.1";
- sha256 = "0hbqichsmxd3xw1abcdyyyg1rrzfkfmywgj47f4yv6pmmvihrkh8";
+ version = "0.1.1";
+ sha256 = "1hav6sk8vnfpn773a1baqclklq04c4dhz6ihirwlbxaz7wdl78qj";
libraryHaskellDepends = [ base bytestring safe-money store ];
testHaskellDepends = [
base bytestring safe-money store tasty tasty-hunit tasty-quickcheck
@@ -193292,8 +194602,8 @@ self: {
}:
mkDerivation {
pname = "safe-money-xmlbf";
- version = "0.1";
- sha256 = "022mcl1gwvwjpjv56938bpklc15r9m6xvsyjhxmnb6d8apjzhpxk";
+ version = "0.1.1";
+ sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6";
libraryHaskellDepends = [ base safe-money text xmlbf ];
testHaskellDepends = [
base bytestring safe-money tasty tasty-hunit tasty-quickcheck text
@@ -193612,22 +194922,22 @@ self: {
broken = true;
}) {};
- "salak_0_2_3" = callPackage
- ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen
- , mtl, QuickCheck, scientific, stm, text, transformers
- , unordered-containers, vector, yaml
+ "salak_0_2_8" = callPackage
+ ({ mkDerivation, attoparsec, base, containers, data-default
+ , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck
+ , scientific, text, time
}:
mkDerivation {
pname = "salak";
- version = "0.2.3";
- sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5";
+ version = "0.2.8";
+ sha256 = "094avciwjwqvgs8d9779w0bbr7vx46dyqq2lwkk5w55k812pndxd";
libraryHaskellDepends = [
- aeson base directory filepath menshen mtl scientific stm text
- transformers unordered-containers vector yaml
+ attoparsec base containers data-default directory filepath menshen
+ mtl pqueue scientific text time
];
testHaskellDepends = [
- aeson base directory filepath hspec menshen mtl QuickCheck
- scientific stm text transformers unordered-containers vector yaml
+ attoparsec base containers data-default directory filepath hspec
+ menshen mtl pqueue QuickCheck scientific text time
];
description = "Configuration Loader";
license = stdenv.lib.licenses.bsd3;
@@ -193635,6 +194945,44 @@ self: {
broken = true;
}) {};
+ "salak-toml" = callPackage
+ ({ mkDerivation, base, hspec, mtl, QuickCheck, salak, text, time
+ , tomland, unordered-containers
+ }:
+ mkDerivation {
+ pname = "salak-toml";
+ version = "0.2.8";
+ sha256 = "02bnynil1b9y1fhk3h40iqgc8r151i112r90nwfbqsgdrzbhwfss";
+ libraryHaskellDepends = [
+ base mtl salak text time tomland unordered-containers
+ ];
+ testHaskellDepends = [
+ base hspec mtl QuickCheck salak text time tomland
+ unordered-containers
+ ];
+ description = "Configuration Loader for toml";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "salak-yaml" = callPackage
+ ({ mkDerivation, aeson, base, hspec, mtl, QuickCheck, salak, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "salak-yaml";
+ version = "0.2.8";
+ sha256 = "0nbn0n19651r5hv3qbxg6ym354sm5170mi99pi60xgb4jgw2zjbw";
+ libraryHaskellDepends = [
+ aeson base mtl salak unordered-containers vector yaml
+ ];
+ testHaskellDepends = [
+ aeson base hspec mtl QuickCheck salak text unordered-containers
+ vector yaml
+ ];
+ description = "Configuration Loader for yaml";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"saltine" = callPackage
({ mkDerivation, base, bytestring, libsodium, profunctors
, QuickCheck, semigroups, test-framework
@@ -194804,6 +196152,26 @@ self: {
broken = true;
}) {};
+ "scheduler" = callPackage
+ ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
+ , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
+ , unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "scheduler";
+ version = "1.0.0";
+ sha256 = "1l8ifgdfzn8w6sd0d9pmlhipbmqs16krzicixf4rxxvr2pl8a2ld";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ atomic-primops base deepseq exceptions unliftio-core
+ ];
+ testHaskellDepends = [
+ base deepseq doctest hspec QuickCheck template-haskell unliftio
+ ];
+ description = "Work stealing scheduler";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"schedyield" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -198165,8 +199533,8 @@ self: {
}:
mkDerivation {
pname = "servant-client-namedargs";
- version = "0.1.1.0";
- sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg";
+ version = "0.1.1.1";
+ sha256 = "1byk3baams1kg1zfnp0y02s2kbg1w62gsri0z43x56g33pgwbsrp";
libraryHaskellDepends = [
base named servant servant-client-core servant-namedargs text
];
@@ -198848,8 +200216,8 @@ self: {
pname = "servant-mock";
version = "0.8.5";
sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f";
- revision = "1";
- editedCabalFile = "0jn1inj9rc6dwf1lml3blwf1kx2d73zpwarn6jwd4j4mf7wvak4a";
+ revision = "2";
+ editedCabalFile = "0269d0yr8sa043wc2ymg3fv60c9pr4jxfy9sar2qqccvngpa1vf5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198913,8 +200281,8 @@ self: {
({ mkDerivation, base, hspec, named, QuickCheck, servant, text }:
mkDerivation {
pname = "servant-namedargs";
- version = "0.1.1.0";
- sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1";
+ version = "0.1.1.1";
+ sha256 = "15fdqk89si2ri63cpdndvp8kjlanf783fwgra899ldwizf637ka7";
libraryHaskellDepends = [ base named servant text ];
testHaskellDepends = [ base hspec named QuickCheck servant ];
description = "Combinators for servant providing named parameters";
@@ -199203,6 +200571,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-rawm_0_3_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, doctest, filepath, Glob
+ , hspec-wai, http-client, http-media, http-types, lens, resourcet
+ , servant, servant-client, servant-client-core, servant-docs
+ , servant-server, tasty, tasty-hspec, tasty-hunit, text
+ , transformers, wai, wai-app-static, warp
+ }:
+ mkDerivation {
+ pname = "servant-rawm";
+ version = "0.3.1.0";
+ sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring filepath http-client http-media http-types lens
+ resourcet servant-client servant-client-core servant-docs
+ servant-server wai wai-app-static
+ ];
+ testHaskellDepends = [
+ base bytestring doctest Glob hspec-wai http-client http-media
+ http-types servant servant-client servant-client-core
+ servant-server tasty tasty-hspec tasty-hunit text transformers wai
+ warp
+ ];
+ description = "Embed a raw 'Application' in a Servant API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-reflex" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, data-default, exceptions, ghcjs-dom, http-api-data, http-media
@@ -199377,8 +200774,8 @@ self: {
}:
mkDerivation {
pname = "servant-server-namedargs";
- version = "0.1.1.0";
- sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda";
+ version = "0.1.1.1";
+ sha256 = "16lgnsq66rrjnky409c49pdr1dfq6d8p96gd1dhph2vwq2156fsd";
libraryHaskellDepends = [
base bytestring http-api-data http-types named servant
servant-namedargs servant-server string-conversions text wai
@@ -200875,31 +202272,34 @@ self: {
"shake" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, directory
- , extra, filepath, filepattern, hashable, heaps, js-flot, js-jquery
- , primitive, process, QuickCheck, random, time, transformers, unix
- , unordered-containers, utf8-string
+ , extra, filepath, filepattern, hashable, heaps, js-dgtable
+ , js-flot, js-jquery, primitive, process, QuickCheck, random, time
+ , transformers, unix, unordered-containers, utf8-string
}:
mkDerivation {
pname = "shake";
- version = "0.17.6";
- sha256 = "17vyd7qd9x2ild3mpwbqhsy9270bl5pdpjrhracs9p83isw4sa1k";
+ version = "0.17.7";
+ sha256 = "09gp3469lljgqmlkznpxl87l1wc91vdv2q6phh65jpkfjdhjp0rv";
+ revision = "1";
+ editedCabalFile = "1ld0k6vv8v8znnihps4z93555hs2n77ga6xk8g642bmrg67fnb7j";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base binary bytestring deepseq directory extra filepath filepattern
- hashable heaps js-flot js-jquery primitive process random time
- transformers unix unordered-containers utf8-string
+ hashable heaps js-dgtable js-flot js-jquery primitive process
+ random time transformers unix unordered-containers utf8-string
];
executableHaskellDepends = [
base binary bytestring deepseq directory extra filepath filepattern
- hashable heaps js-flot js-jquery primitive process random time
- transformers unix unordered-containers utf8-string
+ hashable heaps js-dgtable js-flot js-jquery primitive process
+ random time transformers unix unordered-containers utf8-string
];
testHaskellDepends = [
base binary bytestring deepseq directory extra filepath filepattern
- hashable heaps js-flot js-jquery primitive process QuickCheck
- random time transformers unix unordered-containers utf8-string
+ hashable heaps js-dgtable js-flot js-jquery primitive process
+ QuickCheck random time transformers unix unordered-containers
+ utf8-string
];
description = "Build system library, like Make, but more accurate dependencies";
license = stdenv.lib.licenses.bsd3;
@@ -200912,8 +202312,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.10.2.0";
- sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8";
+ version = "1.10.2.1";
+ sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn";
libraryHaskellDepends = [
base binary dependency directory hs2ats language-ats microlens
shake shake-c shake-cabal shake-ext text
@@ -200926,23 +202326,24 @@ self: {
({ mkDerivation, base, cdeps, composition-prelude, shake }:
mkDerivation {
pname = "shake-c";
- version = "0.4.0.0";
- sha256 = "1n8pm0431dxbrk3fqn1mijgvqbz4i7jcc8pqy60cj76p88kdn24q";
+ version = "0.4.2.0";
+ sha256 = "13ma1mavah98rmxisd4hw5ja96kzbcd36gzxlrsdsjz72i7k9xlh";
libraryHaskellDepends = [ base cdeps composition-prelude shake ];
description = "Library for building C code with shake";
license = stdenv.lib.licenses.bsd3;
}) {};
"shake-cabal" = callPackage
- ({ mkDerivation, base, Cabal, composition-prelude, directory
- , filepath, shake
+ ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq
+ , directory, filepath, hashable, shake
}:
mkDerivation {
pname = "shake-cabal";
- version = "0.2.0.0";
- sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555";
+ version = "0.2.1.1";
+ sha256 = "0d3c1v7pj568fj65fz7dd4h72wpnzz75n1k974nmjbx12vphfd1i";
libraryHaskellDepends = [
- base Cabal composition-prelude directory filepath shake
+ base binary Cabal composition-prelude deepseq directory filepath
+ hashable shake
];
description = "Shake library for use with cabal";
license = stdenv.lib.licenses.bsd3;
@@ -202624,12 +204025,12 @@ self: {
}) {};
"simple-cmd" = callPackage
- ({ mkDerivation, base, directory, filepath, process }:
+ ({ mkDerivation, base, directory, filepath, process, unix }:
mkDerivation {
pname = "simple-cmd";
- version = "0.1.3";
- sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9";
- libraryHaskellDepends = [ base directory filepath process ];
+ version = "0.1.3.1";
+ sha256 = "075fcidyq93cm1y8ag5z50n7zvv0fmi9c6j1wmrzj2972cr16g9p";
+ libraryHaskellDepends = [ base directory filepath process unix ];
description = "Simple String-based process commands";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -204101,6 +205502,8 @@ self: {
];
description = "A very quick-and-dirty WebSocket server";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"skip-list" = callPackage
@@ -204522,6 +205925,18 @@ self: {
broken = true;
}) {};
+ "slist" = callPackage
+ ({ mkDerivation, base, doctest, Glob }:
+ mkDerivation {
+ pname = "slist";
+ version = "0.0.0";
+ sha256 = "0w9rgy0afma2gk36jbk7r8kyvl4vfhd0pfbv6ank2pr6kd5a4a0z";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest Glob ];
+ description = "Sized list";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"sloane" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, bloomfilter, bytestring, conduit, conduit-extra, containers
@@ -208590,6 +210005,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "splitmix_0_0_2" = callPackage
+ ({ mkDerivation, async, base, base-compat-batteries, bytestring
+ , containers, criterion, deepseq, process, random, tf-random, time
+ , vector
+ }:
+ mkDerivation {
+ pname = "splitmix";
+ version = "0.0.2";
+ sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6";
+ libraryHaskellDepends = [ base deepseq random time ];
+ testHaskellDepends = [
+ async base base-compat-batteries bytestring deepseq process random
+ tf-random vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion random tf-random
+ ];
+ description = "Fast Splittable PRNG";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"splitter" = callPackage
({ mkDerivation, base, directory, filepath, parsec, range }:
mkDerivation {
@@ -211268,8 +212705,8 @@ self: {
pname = "step-function";
version = "0.2";
sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
- revision = "1";
- editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4";
+ revision = "2";
+ editedCabalFile = "074399mj4p0sk49rqc9a3fikpsly95mndnmm71ya7wy34nxyafzv";
libraryHaskellDepends = [
base base-compat-batteries containers deepseq QuickCheck
];
@@ -211290,6 +212727,23 @@ self: {
broken = true;
}) {};
+ "stern-brocot" = callPackage
+ ({ mkDerivation, alg, base, criterion, smallcheck, tasty
+ , tasty-smallcheck, universe-base
+ }:
+ mkDerivation {
+ pname = "stern-brocot";
+ version = "0.1.0.0";
+ sha256 = "0x3d6k1vbwa0gn41z3lq877l70mghq1gic37l6vg1v4s5cyx0w6m";
+ libraryHaskellDepends = [ alg base universe-base ];
+ testHaskellDepends = [
+ base smallcheck tasty tasty-smallcheck universe-base
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"stgi" = callPackage
({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
, deepseq, parsers, prettyprinter, prettyprinter-ansi-terminal
@@ -212049,15 +213503,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_34_0" = callPackage
+ "stratosphere_0_36_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.34.0";
- sha256 = "0nrpwc17pmvrd8r0l6k142ihc51vwi2j55009lw1dph4n54zgs4h";
+ version = "0.36.0";
+ sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -212773,22 +214227,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "streamly_0_6_0" = callPackage
- ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
+ "streamly_0_6_1" = callPackage
+ ({ mkDerivation, atomic-primops, base, containers, deepseq
, exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
, monad-control, mtl, QuickCheck, random, transformers
, transformers-base
}:
mkDerivation {
pname = "streamly";
- version = "0.6.0";
- sha256 = "05gwyzp03lz2gv5civg5dkqx1vab261iasrvfvr7sqi4xyj0kzns";
+ version = "0.6.1";
+ sha256 = "141xc4c4ng0cxwlmjcw7v9a7wpi6kdidzwr4wify571ghql75gf2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- atomic-primops base clock containers deepseq exceptions ghc-prim
- heaps lockfree-queue monad-control mtl transformers
- transformers-base
+ atomic-primops base containers deepseq exceptions ghc-prim heaps
+ lockfree-queue monad-control mtl transformers transformers-base
];
testHaskellDepends = [
base containers exceptions hspec mtl QuickCheck random transformers
@@ -213002,8 +214455,8 @@ self: {
}:
mkDerivation {
pname = "strict-list";
- version = "0.1.0.1";
- sha256 = "13s3bwg9zslh04i5djvlf7wfs3ckn3sscxvlawj9nsi3md4fsvdz";
+ version = "0.1.4";
+ sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz";
libraryHaskellDepends = [ base semigroupoids ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -213160,14 +214613,14 @@ self: {
"string-interpolate" = callPackage
({ mkDerivation, base, bytestring, criterion, formatting
- , haskell-src-meta, hspec, interpolate, QuickCheck
- , quickcheck-instances, quickcheck-text, template-haskell, text
- , text-conversions, utf8-string
+ , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
+ , Interpolation, QuickCheck, quickcheck-instances, quickcheck-text
+ , template-haskell, text, text-conversions, utf8-string
}:
mkDerivation {
pname = "string-interpolate";
- version = "0.0.1.0";
- sha256 = "1mc2xg1aybqjrsqlk0w7vkdydxzxr1vknbh6ad3w355svrb6krxm";
+ version = "0.1.0.0";
+ sha256 = "1q80rkp7qhha1swz47rkjmpnmnr4p5837s1179l43v1117ck0yqa";
libraryHaskellDepends = [
base bytestring haskell-src-meta template-haskell text
text-conversions utf8-string
@@ -213177,9 +214630,10 @@ self: {
quickcheck-text text
];
benchmarkHaskellDepends = [
- base bytestring criterion formatting interpolate text
+ base bytestring criterion formatting interpolate
+ interpolatedstring-perl6 Interpolation QuickCheck text
];
- description = "Haskell string interpolation that just works";
+ description = "Haskell string/text/bytestring interpolation that just works";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -213622,6 +215076,8 @@ self: {
pname = "strongswan-sql";
version = "1.2.2.0";
sha256 = "0dv52cf6v84f8q6kckwbgw85iqckd17q3gqif6fh7xrx1z4vhimb";
+ revision = "1";
+ editedCabalFile = "138pksvpff0qggfsiv8s9r45z1ph4779flfm5hxb9br7bh5klslc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -214522,8 +215978,6 @@ self: {
];
description = "Efficiently build a bytestring from smaller chunks";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"supercollider-ht" = callPackage
@@ -214847,6 +216301,8 @@ self: {
pname = "sv-core";
version = "0.4";
sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh";
+ revision = "1";
+ editedCabalFile = "0qzklsb21ha7jgfgx3h565pc3659hd3h1l0ci1yr0mdmj08ignbs";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq double-conversion lens mtl parsec profunctors readable
@@ -215508,6 +216964,134 @@ self: {
broken = true;
}) {};
+ "symantic-http" = callPackage
+ ({ mkDerivation, base, bytestring, http-api-data, http-media
+ , http-types, network-uri, stm, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "symantic-http";
+ version = "0.0.0.20190324";
+ sha256 = "0fvj527b5wjq0wfvzd0n8zna4cy5x1ngj47ysrvyv30ddvh94r4c";
+ libraryHaskellDepends = [
+ base bytestring http-api-data http-media http-types network-uri stm
+ text time transformers
+ ];
+ description = "Symantic combinators for deriving clients or a server from an HTTP API";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "symantic-http-client" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , http-api-data, http-client, http-media, http-types, monad-classes
+ , network-uri, stm, symantic-http, text, time, transformers, word8
+ }:
+ mkDerivation {
+ pname = "symantic-http-client";
+ version = "0.0.0.20190324";
+ sha256 = "0y7va5gnf285h2hv82jfjq63k141mwgy8h4s1wbdqmjirrh75d1d";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring containers http-api-data
+ http-client http-media http-types monad-classes network-uri stm
+ symantic-http text time transformers word8
+ ];
+ description = "symantic-http applied to the derivation of HTTP clients";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "symantic-http-demo" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , http-api-data, http-client, http-media, http-types, monad-classes
+ , network, network-uri, pipes, pipes-bytestring, pipes-safe
+ , symantic-http, symantic-http-client, symantic-http-pipes
+ , symantic-http-server, text, time, transformers, wai, wai-extra
+ , warp
+ }:
+ mkDerivation {
+ pname = "symantic-http-demo";
+ version = "0.0.0.0";
+ sha256 = "09fkni3zal4bvhf00b57qpf83bk7azcxps4s9nd01zsmnzvhlfs7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base pipes symantic-http text ];
+ executableHaskellDepends = [
+ base base64-bytestring bytestring containers http-api-data
+ http-client http-media http-types monad-classes network network-uri
+ pipes pipes-bytestring pipes-safe symantic-http
+ symantic-http-client symantic-http-pipes symantic-http-server text
+ time transformers wai wai-extra warp
+ ];
+ description = "Demo for symantic-http and its companion libraries";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "symantic-http-pipes" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , http-api-data, http-media, http-types, lens-family-core
+ , monad-classes, network-uri, pipes, pipes-bytestring, pipes-group
+ , pipes-parse, pipes-safe, stm, symantic-http, text, time
+ , transformers, word8
+ }:
+ mkDerivation {
+ pname = "symantic-http-pipes";
+ version = "0.0.0.20190324";
+ sha256 = "0c44vcvcpjlpj2wc58mqaaky68s3cjqa8gimv3nnj634m2avmsll";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring containers http-api-data
+ http-media http-types lens-family-core monad-classes network-uri
+ pipes pipes-bytestring pipes-group pipes-parse pipes-safe stm
+ symantic-http text time transformers word8
+ ];
+ description = "Streaming support through pipes for symantic-http";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "symantic-http-server" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , http-api-data, http-media, http-types, monad-classes, network-uri
+ , stm, symantic-http, text, time, transformers, wai, warp, word8
+ }:
+ mkDerivation {
+ pname = "symantic-http-server";
+ version = "0.0.0.20190324";
+ sha256 = "0drng8xsafq5xm08frjg4fc206lxwb7wq2jj6n7zlv8k3nfnzvzy";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring containers http-api-data
+ http-media http-types monad-classes network-uri stm symantic-http
+ text time transformers wai warp word8
+ ];
+ description = "symantic-http applied to the derivation of HTTP servers";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "symantic-http-test" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , deepseq, filepath, hashable, hspec, hspec-wai, http-api-data
+ , http-client, http-media, http-types, monad-classes, network
+ , network-uri, pipes, pipes-bytestring, pipes-safe, symantic-http
+ , symantic-http-client, symantic-http-pipes, symantic-http-server
+ , tasty, tasty-hspec, tasty-hunit, text, time, transformers, wai
+ , wai-extra, warp
+ }:
+ mkDerivation {
+ pname = "symantic-http-test";
+ version = "0.0.0.20190324";
+ sha256 = "0ppxdy1m1a0y3jbkbcaf1syknk5ybri1scs5vhkphvm50fa21qcj";
+ isLibrary = false;
+ isExecutable = false;
+ testHaskellDepends = [
+ base base64-bytestring bytestring containers deepseq filepath
+ hashable hspec hspec-wai http-api-data http-client http-media
+ http-types monad-classes network network-uri pipes pipes-bytestring
+ pipes-safe symantic-http symantic-http-client symantic-http-pipes
+ symantic-http-server tasty tasty-hspec tasty-hunit text time
+ transformers wai wai-extra warp
+ ];
+ description = "Test symantic-http and its companion libraries";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"symantic-lib" = callPackage
({ mkDerivation, base, bytestring, containers, megaparsec
, monad-classes, mono-traversable, symantic, symantic-grammar
@@ -215739,20 +217323,20 @@ self: {
"syntactic" = callPackage
({ mkDerivation, base, constraints, containers, criterion
, data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty
- , tasty-golden, tasty-quickcheck, tasty-th, template-haskell
- , tree-view, utf8-string
+ , tasty-golden, tasty-hunit, tasty-quickcheck, tasty-th
+ , template-haskell, tree-view, utf8-string
}:
mkDerivation {
pname = "syntactic";
- version = "3.7.1";
- sha256 = "06k2n84dn9rp59rcv29hqkrm5mri6hyhh0hdbh7qfqxa7m06sl6w";
+ version = "3.8";
+ sha256 = "1vwr2wfa9b4782k3v4bp0p5qqy14mwx9mmlax0jskpqwzx0azxvi";
libraryHaskellDepends = [
base constraints containers data-hash deepseq mtl syb
template-haskell tree-view
];
testHaskellDepends = [
base containers mtl QuickCheck tagged tasty tasty-golden
- tasty-quickcheck tasty-th utf8-string
+ tasty-hunit tasty-quickcheck tasty-th utf8-string
];
benchmarkHaskellDepends = [ base criterion deepseq ];
description = "Generic representation and manipulation of abstract syntax";
@@ -216858,6 +218442,8 @@ self: {
executablePkgconfigDepends = [ gtk3 ];
description = "A desktop bar similar to xmobar, but with more GUI";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3;};
"tag-bits" = callPackage
@@ -217682,6 +219268,8 @@ self: {
];
description = "Terminal Art";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"task" = callPackage
@@ -217744,27 +219332,28 @@ self: {
}) {};
"taskell" = callPackage
- ({ mkDerivation, aeson, base, brick, bytestring, classy-prelude
- , config-ini, containers, directory, file-embed, fold-debounce
- , http-client, http-conduit, http-types, lens, mtl, tasty
- , tasty-discover, tasty-expected-failure, tasty-hunit
- , template-haskell, text, time, vty
+ ({ mkDerivation, aeson, attoparsec, base, brick, bytestring
+ , classy-prelude, config-ini, containers, directory, file-embed
+ , fold-debounce, http-client, http-conduit, http-types, lens, mtl
+ , raw-strings-qq, tasty, tasty-discover, tasty-expected-failure
+ , tasty-hunit, template-haskell, text, time, vty
}:
mkDerivation {
pname = "taskell";
- version = "1.3.6.0";
- sha256 = "1s7wgn9ixmk5h9s5a977ddj1a0fsjmpifl0i97pak35rk92ca7wc";
+ version = "1.4.0.0";
+ sha256 = "1l0q1wyhkh271rpd6qw12j1kkzdqqcvp2xvqwykn98jwmnhswm4m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base brick bytestring classy-prelude config-ini containers
- directory file-embed fold-debounce http-client http-conduit
- http-types lens mtl template-haskell text time vty
+ aeson attoparsec base brick bytestring classy-prelude config-ini
+ containers directory file-embed fold-debounce http-client
+ http-conduit http-types lens mtl template-haskell text time vty
];
executableHaskellDepends = [ base classy-prelude ];
testHaskellDepends = [
- aeson base classy-prelude containers file-embed lens tasty
- tasty-discover tasty-expected-failure tasty-hunit text time
+ aeson base classy-prelude containers file-embed lens raw-strings-qq
+ tasty tasty-discover tasty-expected-failure tasty-hunit text time
+ vty
];
testToolDepends = [ tasty-discover ];
description = "A command-line kanban board/task manager";
@@ -217876,12 +219465,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty-dejafu_2_0_0_0" = callPackage
+ "tasty-dejafu_2_0_0_1" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
pname = "tasty-dejafu";
- version = "2.0.0.0";
- sha256 = "1jy1rh26xr64kwvywcfmb55x088hbrg8dhcixy9lhw76xrzjpkia";
+ version = "2.0.0.1";
+ sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z";
libraryHaskellDepends = [ base dejafu random tagged tasty ];
description = "Deja Fu support for the Tasty test framework";
license = stdenv.lib.licenses.mit;
@@ -218677,6 +220266,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tds" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
+ , hostname, mtl, network, stm, streaming, streaming-attoparsec
+ , streaming-bytestring, tardis, text, transformers, unix, vector
+ }:
+ mkDerivation {
+ pname = "tds";
+ version = "0.1.0.0";
+ sha256 = "1irgp0sv20vlzvyc09wa8ycf3k120ab623r901n638hrwvrwmz43";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec attoparsec-binary base bytestring hostname mtl network
+ stm streaming streaming-attoparsec streaming-bytestring tardis text
+ transformers unix vector
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"teams" = callPackage
({ mkDerivation, base, containers, fgl, graphviz }:
mkDerivation {
@@ -218724,6 +220336,21 @@ self: {
broken = true;
}) {};
+ "telega" = callPackage
+ ({ mkDerivation, aeson, base, http-client, lens, text, transformers
+ , wreq
+ }:
+ mkDerivation {
+ pname = "telega";
+ version = "0.1.0";
+ sha256 = "1ixdac26mkd98apfq3h4xihlwdj8y1mjrcz8f17pkxkb4cmra3cd";
+ libraryHaskellDepends = [
+ aeson base http-client lens text transformers wreq
+ ];
+ description = "Telegram Bot API binding";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"telegram" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default
, http-conduit, url, utf8-string
@@ -219537,6 +221164,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tensors_0_1_3" = callPackage
+ ({ mkDerivation, base, criterion, hspec, QuickCheck, reflection
+ , vector
+ }:
+ mkDerivation {
+ pname = "tensors";
+ version = "0.1.3";
+ sha256 = "1ca289878jfwhwlawdwbf0mii8y117ha7hyqrlqx651qsswlwwcf";
+ libraryHaskellDepends = [ base vector ];
+ testHaskellDepends = [ base hspec QuickCheck reflection vector ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Tensor in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"term-rewriting" = callPackage
({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit
, mtl, multiset, parsec, QuickCheck, union-find-array
@@ -219777,6 +221420,8 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;};
"termplot" = callPackage
@@ -219998,6 +221643,8 @@ self: {
pname = "test-framework-quickcheck2";
version = "0.3.0.5";
sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9";
+ revision = "1";
+ editedCabalFile = "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d";
libraryHaskellDepends = [
base extensible-exceptions QuickCheck random test-framework
];
@@ -221216,6 +222863,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-show_3_8" = callPackage
+ ({ mkDerivation, array, base, base-compat-batteries, base-orphans
+ , bifunctors, bytestring, bytestring-builder, containers
+ , contravariant, criterion, deepseq, deriving-compat
+ , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover
+ , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+ , tagged, template-haskell, text, th-abstraction, th-lift
+ , transformers, transformers-compat, void
+ }:
+ mkDerivation {
+ pname = "text-show";
+ version = "3.8";
+ sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi";
+ revision = "1";
+ editedCabalFile = "03q739smdz7z0nnx6pg7d58mmq65y7abhdxwy57akf7pichnw13b";
+ libraryHaskellDepends = [
+ array base base-compat-batteries bifunctors bytestring
+ bytestring-builder containers contravariant generic-deriving
+ ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+ template-haskell text th-abstraction th-lift transformers
+ transformers-compat void
+ ];
+ testHaskellDepends = [
+ array base base-compat-batteries base-orphans bytestring
+ bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+ nats QuickCheck quickcheck-instances semigroups tagged
+ template-haskell text transformers transformers-compat
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
+ description = "Efficient conversion of values into Text";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-show-instances" = callPackage
({ mkDerivation, base, base-compat-batteries, bifunctors, binary
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -221229,6 +222911,8 @@ self: {
pname = "text-show-instances";
version = "3.7";
sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c";
+ revision = "1";
+ editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -221942,6 +223626,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-orphans_0_13_7" = callPackage
+ ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
+ , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many
+ }:
+ mkDerivation {
+ pname = "th-orphans";
+ version = "0.13.7";
+ sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy";
+ libraryHaskellDepends = [
+ base mtl template-haskell th-lift th-lift-instances th-reify-many
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim hspec template-haskell th-lift
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Orphan instances for TH datatypes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-pprint" = callPackage
({ mkDerivation, base, lens, pretty, template-haskell }:
mkDerivation {
@@ -222279,6 +223983,8 @@ self: {
pname = "these";
version = "0.8";
sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga";
+ revision = "1";
+ editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11";
libraryHaskellDepends = [
aeson assoc base base-compat bifunctors binary containers
data-default-class deepseq hashable keys lens mtl QuickCheck
@@ -222930,24 +224636,6 @@ self: {
}) {};
"tidal" = callPackage
- ({ mkDerivation, base, bifunctors, colour, containers, hosc
- , microspec, mwc-random, network, parsec, template-haskell, text
- , transformers, vector
- }:
- mkDerivation {
- pname = "tidal";
- version = "1.0.8";
- sha256 = "0mxwaalbc23rmk163r40vqw15f3kjg5bagpq7f6rn3nyks7095qz";
- libraryHaskellDepends = [
- base bifunctors colour containers hosc mwc-random network parsec
- template-haskell text transformers vector
- ];
- testHaskellDepends = [ base containers microspec parsec ];
- description = "Pattern language for improvised music";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "tidal_1_0_10" = callPackage
({ mkDerivation, base, bifunctors, colour, containers, hosc
, microspec, mwc-random, network, parsec, template-haskell, text
, transformers, vector
@@ -222963,7 +224651,6 @@ self: {
testHaskellDepends = [ base containers microspec parsec ];
description = "Pattern language for improvised music";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tidal-midi" = callPackage
@@ -225055,8 +226742,8 @@ self: {
}:
mkDerivation {
pname = "too-many-cells";
- version = "0.1.3.1";
- sha256 = "0av2fr2y1b70rxfqsz1kfgkfj7i5j76zpn351r2s8navwa4pf116";
+ version = "0.1.4.0";
+ sha256 = "1wg5gx7iydwhnp8xj72lmgpa7n5dd62cxjswlkplj944c2szdmdp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -225638,6 +227325,8 @@ self: {
];
description = "A command-line tool for live monitoring";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"traction" = callPackage
@@ -225906,6 +227595,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "transformers-compat_0_6_3" = callPackage
+ ({ mkDerivation, base, ghc-prim, transformers }:
+ mkDerivation {
+ pname = "transformers-compat";
+ version = "0.6.3";
+ sha256 = "08gpfib5s92rxq50y1in9zw2nbi2wm8k3xq7y6s0iahsn4vl5i5i";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ description = "A small compatibility shim for the transformers library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"transformers-compose" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -226172,44 +227873,36 @@ self: {
"trasa" = callPackage
({ mkDerivation, base, binary, bytestring, doctest, hashable
- , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck
- , text, unordered-containers, vinyl
+ , http-media, http-types, quantification, text
+ , unordered-containers
}:
mkDerivation {
pname = "trasa";
- version = "0.3";
- sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6";
+ version = "0.4";
+ sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q";
libraryHaskellDepends = [
- base binary bytestring hashable http-media http-types text
- unordered-containers vinyl
- ];
- testHaskellDepends = [
- base bytestring doctest tasty tasty-hunit tasty-quickcheck text
- vinyl
+ base binary bytestring hashable http-media http-types
+ quantification text unordered-containers
];
+ testHaskellDepends = [ base doctest ];
description = "Type Safe Web Routing";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
"trasa-client" = callPackage
- ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
- , containers, http-client, http-media, http-types, ip, text, trasa
- , unordered-containers
+ ({ mkDerivation, base, binary, bytestring, case-insensitive
+ , containers, http-client, http-media, http-types, text, trasa
}:
mkDerivation {
pname = "trasa-client";
- version = "0.3";
- sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns";
+ version = "0.4";
+ sha256 = "0xfqjvc1a4vbm8kvw1s11n174sc33hb7psd5lwpa6hipifw3kmb1";
libraryHaskellDepends = [
base binary bytestring case-insensitive containers http-client
http-media http-types text trasa
];
- testHaskellDepends = [
- aeson base http-client http-types ip text trasa
- unordered-containers
- ];
description = "Type safe http requests";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -226235,23 +227928,36 @@ self: {
"trasa-server" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
- , doctest, http-client, http-media, http-types, mtl, tasty
- , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp
+ , http-media, http-types, mtl, text, trasa, wai
}:
mkDerivation {
pname = "trasa-server";
- version = "0.2";
- sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy";
+ version = "0.4";
+ sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv";
libraryHaskellDepends = [
base bytestring case-insensitive containers http-media http-types
mtl text trasa wai
];
- testHaskellDepends = [
- base bytestring doctest http-client tasty tasty-hunit
- tasty-quickcheck text trasa vinyl warp
- ];
description = "Type safe web server";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "trasa-th" = callPackage
+ ({ mkDerivation, base, containers, megaparsec, template-haskell
+ , trasa
+ }:
+ mkDerivation {
+ pname = "trasa-th";
+ version = "0.4";
+ sha256 = "1jfnm0im5qk6s6a9fbdrz228mic5ribi53fyl7nnk8gsr5lrl22z";
+ libraryHaskellDepends = [
+ base containers megaparsec template-haskell trasa
+ ];
+ testHaskellDepends = [ base trasa ];
+ description = "Template Haskell to generate trasa routes";
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -226381,8 +228087,8 @@ self: {
pname = "tree-diff";
version = "0.0.2";
sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq";
- revision = "1";
- editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0";
+ revision = "2";
+ editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -227206,8 +228912,10 @@ self: {
}:
mkDerivation {
pname = "tttool";
- version = "1.8";
- sha256 = "0j4lgkjg28i7wlz5rnlrii6mzx2bqsagrg3wiiw1z2ncik6qm472";
+ version = "1.8.1";
+ sha256 = "0y33vflq6l51yvv7ilkvra75lhia18gmif0jc5gaqigxl1adfkw1";
+ revision = "1";
+ editedCabalFile = "1rppvnlrgc6kk5k8m0jn0ckyv0bq0l3h2r4gvkbjbd25mj0ls7gh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -229266,6 +230974,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "typerep-map_0_3_2" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq
+ , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat
+ , hedgehog, primitive, QuickCheck, tasty, tasty-discover
+ , tasty-hedgehog, tasty-hspec, vector
+ }:
+ mkDerivation {
+ pname = "typerep-map";
+ version = "0.3.2";
+ sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0";
+ libraryHaskellDepends = [
+ base containers deepseq ghc-prim primitive vector
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover
+ tasty-hedgehog tasty-hspec
+ ];
+ testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq dependent-map dependent-sum
+ ghc-typelits-knownnat
+ ];
+ doHaddock = false;
+ description = "Efficient implementation of a dependent map with types as keys";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"types-compat" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -229977,33 +231713,35 @@ self: {
}) {};
"unbeliever" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, Cabal
- , chronologique, containers, deepseq, directory, exceptions
- , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter
+ ({ mkDerivation, aeson, async, base, bytestring, chronologique
+ , containers, deepseq, directory, exceptions, fingertree, gauge
+ , hashable, hourglass, hspec, mtl, prettyprinter
, prettyprinter-ansi-terminal, safe-exceptions, scientific, stm
, template-haskell, terminal-size, text, text-short, transformers
, unix, unordered-containers, vector
}:
mkDerivation {
pname = "unbeliever";
- version = "0.9.2.0";
- sha256 = "0fy9slvc0gvxr6z7zmz1xyk5qkxrfq4nbs9q8z11viqp0qg0yssx";
+ version = "0.9.3.2";
+ sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b";
+ revision = "1";
+ editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72";
libraryHaskellDepends = [
- aeson async base bytestring Cabal chronologique containers deepseq
+ aeson async base bytestring chronologique containers deepseq
directory exceptions fingertree hashable hourglass mtl
prettyprinter prettyprinter-ansi-terminal safe-exceptions
scientific stm template-haskell terminal-size text text-short
transformers unix unordered-containers vector
];
testHaskellDepends = [
- aeson async base bytestring Cabal chronologique containers deepseq
+ aeson async base bytestring chronologique containers deepseq
directory exceptions fingertree hashable hourglass hspec mtl
prettyprinter prettyprinter-ansi-terminal safe-exceptions
scientific stm template-haskell terminal-size text text-short
transformers unix unordered-containers vector
];
benchmarkHaskellDepends = [
- aeson async base bytestring Cabal chronologique containers deepseq
+ aeson async base bytestring chronologique containers deepseq
directory exceptions fingertree gauge hashable hourglass mtl
prettyprinter prettyprinter-ansi-terminal safe-exceptions
scientific stm template-haskell terminal-size text text-short
@@ -232659,8 +234397,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "util";
- version = "0.1.12.0";
- sha256 = "0qm7bm5dmcz7kn9p882fwpihj5azm2baxz68jnimmw1mp5w66fw2";
+ version = "0.1.13.0";
+ sha256 = "15b5m2v1v4ab65cfd6ppwinq2pnv5212g1qwnyw6rwyiaac8k3gd";
libraryHaskellDepends = [ base ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
@@ -233303,6 +235041,17 @@ self: {
broken = true;
}) {};
+ "valid" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "valid";
+ version = "0.1.0.0";
+ sha256 = "10nrr48ki8vxckbz1q24nn2x8vwflj4ndgvlj99ishyypb1ijx37";
+ libraryHaskellDepends = [ base ];
+ description = "Type isomorphic to `Either` with `Applicative` instance which combines errors";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"valid-names" = callPackage
({ mkDerivation, base, containers, MonadRandom }:
mkDerivation {
@@ -234268,8 +236017,8 @@ self: {
}:
mkDerivation {
pname = "vector-extras";
- version = "0.2.1";
- sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz";
+ version = "0.2.1.1";
+ sha256 = "0q5wm0hfk84hr9rgbb084d222ys0k1hab5cydwnnrpb7wy42199p";
libraryHaskellDepends = [
base containers deferred-folds foldl hashable unordered-containers
vector
@@ -234901,8 +236650,8 @@ self: {
}:
mkDerivation {
pname = "viewprof";
- version = "0.0.0.27";
- sha256 = "0yfrh7ifgn4vw9yqn0rif040sabbgs2j42rkds48fam30cdr12v6";
+ version = "0.0.0.28";
+ sha256 = "1l2cjisay7vbqb64xd4lkz594x2ji2gs249h9j4anbifzg6bbjb2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -235756,8 +237505,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "vulkan-api";
- version = "1.1.3.0";
- sha256 = "1sd7rasg7305dlfq1mwyxw45gwy4ria0cbcd18pnilwjgsla7kvc";
+ version = "1.1.4.0";
+ sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22";
libraryHaskellDepends = [ base ];
description = "Low-level low-overhead vulkan api bindings";
license = stdenv.lib.licenses.bsd3;
@@ -236379,6 +238128,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "wai-lambda" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+ , directory, http-types, iproute, network, temporary, text
+ , unliftio, unordered-containers, vault, wai
+ }:
+ mkDerivation {
+ pname = "wai-lambda";
+ version = "0.1.0.0";
+ sha256 = "1m77i3zazvpa4jirvgxjdik5fnzarrbmavvi48d72c8a8jjwsx9x";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring case-insensitive directory http-types
+ iproute network temporary text unliftio unordered-containers vault
+ wai
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring case-insensitive directory http-types
+ iproute network temporary text unliftio unordered-containers vault
+ wai
+ ];
+ description = "Haskell Webapps on AWS Lambda";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"wai-lens" = callPackage
({ mkDerivation, base, bytestring, http-types, lens, network, text
, vault, wai
@@ -238553,6 +240327,30 @@ self: {
broken = true;
}) {};
+ "webby" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, fast-logger
+ , formatting, http-api-data, http-types, monad-logger, protolude
+ , resourcet, tasty, tasty-hunit, tasty-quickcheck, text, unliftio
+ , unordered-containers, wai
+ }:
+ mkDerivation {
+ pname = "webby";
+ version = "0.1.0.1";
+ sha256 = "0xscyd06zc4sjmhrf4l8cc9qmpw2vx2vydvlv0mw47hk660as67v";
+ libraryHaskellDepends = [
+ aeson base binary bytestring fast-logger formatting http-api-data
+ http-types monad-logger protolude resourcet text unliftio
+ unordered-containers wai
+ ];
+ testHaskellDepends = [
+ aeson base binary bytestring fast-logger formatting http-api-data
+ http-types monad-logger protolude resourcet tasty tasty-hunit
+ tasty-quickcheck text unliftio unordered-containers wai
+ ];
+ description = "A super-simple web server framework";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"webcloud" = callPackage
({ mkDerivation, base, bytestring, cgi, optparse-applicative }:
mkDerivation {
@@ -239210,8 +241008,8 @@ self: {
({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
mkDerivation {
pname = "weigh";
- version = "0.0.13";
- sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4";
+ version = "0.0.14";
+ sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g";
libraryHaskellDepends = [
base deepseq mtl process split temporary
];
@@ -239748,6 +241546,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "winery_1_0_1" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal
+ , containers, cpu, deepseq, directory, fast-builder, gauge
+ , hashable, HUnit, megaparsec, mtl, prettyprinter
+ , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+ , scientific, semigroups, serialise, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "winery";
+ version = "1.0.1";
+ sha256 = "03g397c7s13brm5jsdzrwg5vyanvj6yznhn95aax7a8dwvhphk2n";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers cpu fast-builder hashable HUnit
+ megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck
+ scientific semigroups text time transformers unordered-containers
+ vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring megaparsec prettyprinter
+ prettyprinter-ansi-terminal text
+ ];
+ testHaskellDepends = [
+ base bytestring containers fast-builder QuickCheck
+ quickcheck-instances scientific text time unordered-containers
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ aeson base binary bytestring cereal deepseq directory gauge
+ serialise text
+ ];
+ description = "Sustainable serialisation library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"winio" = callPackage
({ mkDerivation, base, bytestring, extensible-exceptions, kernel32
, network, winerror, ws2_32
@@ -239881,8 +241717,8 @@ self: {
}:
mkDerivation {
pname = "withdependencies";
- version = "0.2.4.2";
- sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz";
+ version = "0.2.4.3";
+ sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7";
libraryHaskellDepends = [
base conduit containers mtl profunctors
];
@@ -242998,6 +244834,28 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "xmlbf_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck
+ , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "xmlbf";
+ version = "0.5";
+ sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq text transformers
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring deepseq QuickCheck quickcheck-instances tasty
+ tasty-hunit tasty-quickcheck text transformers unordered-containers
+ ];
+ description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xmlbf-xeno" = callPackage
({ mkDerivation, base, bytestring, html-entities, QuickCheck
, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
@@ -243018,6 +244876,27 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "xmlbf-xeno_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, html-entities, QuickCheck
+ , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+ , unordered-containers, xeno, xmlbf
+ }:
+ mkDerivation {
+ pname = "xmlbf-xeno";
+ version = "0.2";
+ sha256 = "1x33885kjddmc39p2jxafypcgpm5fajdxzdd6l9z5bpihlpgk7ig";
+ libraryHaskellDepends = [
+ base bytestring html-entities text unordered-containers xeno xmlbf
+ ];
+ testHaskellDepends = [
+ base bytestring QuickCheck quickcheck-instances tasty tasty-hunit
+ tasty-quickcheck text unordered-containers xmlbf
+ ];
+ description = "xeno backend support for the xmlbf library";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xmlbf-xmlhtml" = callPackage
({ mkDerivation, base, bytestring, html-entities, QuickCheck
, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
@@ -243025,8 +244904,8 @@ self: {
}:
mkDerivation {
pname = "xmlbf-xmlhtml";
- version = "0.1.1";
- sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4";
+ version = "0.2";
+ sha256 = "1h2w98jdr3r9isbl5g39gd3fxlm4vqib15grqgarhx2gj1k9vlxd";
libraryHaskellDepends = [
base bytestring html-entities text unordered-containers xmlbf
xmlhtml
@@ -243037,6 +244916,8 @@ self: {
];
description = "xmlhtml backend support for the xmlbf library";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"xmlgen" = callPackage
@@ -244006,6 +245887,39 @@ self: {
broken = true;
}) {};
+ "yam_0_5_16" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
+ , data-default, fast-logger, hspec, http-client, http-types, lens
+ , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection
+ , salak, scientific, servant-client, servant-server
+ , servant-swagger, servant-swagger-ui, swagger2, text
+ , unliftio-core, unordered-containers, vault, vector, wai, warp
+ }:
+ mkDerivation {
+ pname = "yam";
+ version = "0.5.16";
+ sha256 = "107wnnb8q47kl78gl92b6w6z6pvjqqwpisvwcw0xipmisk5d6nzv";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring binary bytestring data-default
+ fast-logger http-client http-types lens menshen monad-logger mtl
+ mwc-random reflection salak scientific servant-client
+ servant-server servant-swagger servant-swagger-ui swagger2 text
+ unliftio-core unordered-containers vault vector wai warp
+ ];
+ testHaskellDepends = [
+ aeson base base16-bytestring binary bytestring data-default
+ fast-logger hspec http-client http-types lens menshen monad-logger
+ mtl mwc-random QuickCheck reflection salak scientific
+ servant-client servant-server servant-swagger servant-swagger-ui
+ swagger2 text unliftio-core unordered-containers vault vector wai
+ warp
+ ];
+ description = "Yam Web";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"yam-app" = callPackage
({ mkDerivation, aeson, base, conduit, containers, ctrie
, data-default, directory, exceptions, fast-logger, monad-control
@@ -244062,6 +245976,23 @@ self: {
broken = true;
}) {};
+ "yam-datasource_0_5_16" = callPackage
+ ({ mkDerivation, base, conduit, persistent, resource-pool
+ , resourcet, unliftio-core, yam
+ }:
+ mkDerivation {
+ pname = "yam-datasource";
+ version = "0.5.16";
+ sha256 = "0361nlw1fy8kb7wmkksp42zfx7fd7vdjxwvmx5j8mac4mgwyarzq";
+ libraryHaskellDepends = [
+ base conduit persistent resource-pool resourcet unliftio-core yam
+ ];
+ description = "Yam DataSource Middleware";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"yam-job" = callPackage
({ mkDerivation, base, cron, yam-app }:
mkDerivation {
@@ -245645,26 +247576,27 @@ 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
+ , blaze-markup, bytestring, case-insensitive, cereal, clientsession
+ , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
+ , gauge, hspec, hspec-expectations, http-types, HUnit, memory
+ , 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.12";
- sha256 = "1zyvjbphzkhch4wv8lj019dd3jnyicdj514fhy1ggwqkff3kyblj";
+ version = "1.6.13";
+ sha256 = "0a7rsm71d8a0snbx6x9hj4ba0f0vg51rwzchsgvrh6fdfm0clkgq";
libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup byteable bytestring
+ aeson auto-update base blaze-html blaze-markup 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
+ containers cookie deepseq fast-logger http-types memory
+ 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
@@ -245739,6 +247671,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-csp_0_2_5_0" = callPackage
+ ({ mkDerivation, attoparsec, base, case-insensitive, hspec
+ , mono-traversable, network-uri, semigroups, syb, template-haskell
+ , text, wai, yesod, yesod-core, yesod-test
+ }:
+ mkDerivation {
+ pname = "yesod-csp";
+ version = "0.2.5.0";
+ sha256 = "16b569jwxw7rim9fmjkl3slddclcp1x75jf8czjj89d1wp202x15";
+ libraryHaskellDepends = [
+ attoparsec base case-insensitive mono-traversable network-uri
+ semigroups syb template-haskell text wai yesod yesod-core
+ ];
+ testHaskellDepends = [
+ attoparsec base hspec network-uri semigroups template-haskell yesod
+ yesod-test
+ ];
+ description = "Add CSP headers to Yesod apps";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-datatables" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, data-default
, HUnit, monad-control, persistent, persistent-sqlite
@@ -248003,15 +249957,16 @@ self: {
}) {};
"z3" = callPackage
- ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3
+ ({ mkDerivation, base, containers, gomp, hspec, QuickCheck
+ , transformers, z3
}:
mkDerivation {
pname = "z3";
- version = "4.3.1";
- sha256 = "0fsddp5267bpmccg2hhra4z8isqmrdgcp0i0amrxsacgyqa4iqbv";
+ version = "408.0";
+ sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base containers mtl ];
+ libraryHaskellDepends = [ base containers transformers ];
librarySystemDepends = [ gomp z3 ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Bindings for the Z3 Theorem Prover";
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 9f18db1e6e95..41ce20373d62 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -181,6 +181,8 @@ rec {
enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; });
disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; });
+ enableSeparateBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = true; });
+
appendPatch = drv: x: appendPatches drv [x];
appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; });
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index fd270dedefcc..158987d4e0ef 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, libtool, readline, gmp
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- buildPackages.buildPackages.guile_1_8;
+ pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool ];
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 433271d9c85e..17ca1d1dcd95 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ stdenv, pkgsBuildBuild, buildPackages
, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@@ -22,7 +22,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- buildPackages.buildPackages.guile_2_0;
+ pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 1943b10bdcaf..5e458c6e2ccc 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@@ -23,7 +23,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- buildPackages.buildPackages.guile;
+ pkgsBuildBuild.guile;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
new file mode 100644
index 000000000000..00acfd0df8c1
--- /dev/null
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "janet";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "janet-lang";
+ repo = "janet";
+ rev = "v${version}";
+ sha256 = "1590f1fxb6qfhf1vp2xhbvdn2jfrgipn5572cckk1ma7f13jnkpy";
+ };
+
+ JANET_BUILD=''\"release\"'';
+ PREFIX = placeholder "out";
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Janet programming language";
+ homepage = https://janet-lang.org/;
+ license = stdenv.lib.licenses.mit;
+ platforms = platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
+ };
+}
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f6990fd29d01..9adc72f941a2 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -185,7 +185,7 @@ in rec {
# the latest Devel version
perldevel = common {
- version = "5.29.6";
- sha256 = "0wj2bia8s30788f69mf5s533l72zbhqpdr85kkk97yrh1c9sgcd6";
+ version = "5.29.9";
+ sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm";
};
}
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index e147a05d3cd8..2fbf7a0be2cf 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -7,6 +7,7 @@
, gst-plugins-bad ? null
, libnotify ? null
, gnome3 ? null
+, gtk3 ? null
, enableUsb ? true
, enablePacketSocket ? true
, enableViewer ? true
@@ -26,19 +27,19 @@ in
assert enableViewer -> enableGstPlugin;
assert enableViewer -> libnotify != null;
assert enableViewer -> gnome3 != null;
+ assert enableViewer -> gtk3 != null;
assert enableViewer -> gstreamerAtLeastVersion1;
stdenv.mkDerivation rec {
pname = "aravis";
- version = "0.5.13";
- name = "${pname}-${version}";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "AravisProject";
- repo = "aravis";
- rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48";
- sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy";
+ repo = pname;
+ rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}";
+ sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga";
};
outputs = [ "bin" "dev" "out" "lib" ];
@@ -55,7 +56,7 @@ in
++ stdenv.lib.optional enableUsb libusb
++ stdenv.lib.optional enablePacketSocket audit
++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
- ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
preAutoreconf = ''./autogen.sh'';
@@ -80,7 +81,7 @@ in
longDescription = ''
Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
'';
- homepage = https://aravisproject.github.io/docs/aravis-0.5;
+ homepage = "https://aravisproject.github.io/docs/aravis-0.5";
license = stdenv.lib.licenses.lgpl2;
maintainers = [];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 297883ecd0a4..f276d0bf12ee 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
+{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, gtk3Support ? false, gtk3 ? null
, qt4 ? null
@@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap";
};
- patches = [ ./no-mkdir-localstatedir.patch ];
+ patches = [
+ ./no-mkdir-localstatedir.patch
+ (fetchpatch {
+ name ="CVE-2017-6519-CVE-2018-100084.patch";
+ url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch;
+ sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q";
+ })
+ ];
buildInputs = [ libdaemon dbus glib expat libiconv ]
++ (with perlPackages; [ perl XMLParser ])
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
new file mode 100644
index 000000000000..12fc1834e905
--- /dev/null
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+, Cocoa, OpenGL
+}:
+
+stdenv.mkDerivation rec {
+ name = "bullet-${version}";
+ version = "2019-03-27";
+
+ src = fetchFromGitHub {
+ owner = "olegklimov";
+ repo = "bullet3";
+ # roboschool needs the HEAD of a specific branch of this fork, see
+ # https://github.com/openai/roboschool/issues/126#issuecomment-421643980
+ # https://github.com/openai/roboschool/pull/62
+ # https://github.com/openai/roboschool/issues/124
+ rev = "3687507ddc04a15de2c5db1e349ada3f2b34b3d6";
+ sha256 = "1wd7vj9136dl7lfb8ll0rc2fdl723y3ls9ipp7657yfl2xrqhvkb";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+
+ patches = [ ./gwen-narrowing.patch ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
+ sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
+ '';
+
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DBUILD_CPU_DEMOS=OFF"
+ "-DINSTALL_EXTRA_LIBS=ON"
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ "-DOPENGL_FOUND=true"
+ "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework"
+ "-DBUILD_BULLET2_DEMOS=OFF"
+ "-DBUILD_UNIT_TESTS=OFF"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A professional free 3D Game Multiphysics Library";
+ longDescription = ''
+ Bullet 3D Game Multiphysics Library provides state of the art collision
+ detection, soft body and rigid body dynamics.
+ '';
+ homepage = http://bulletphysics.org;
+ license = licenses.zlib;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 54f1c459212d..1fbee74f5dbb 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "catch2-${version}";
- version = "2.6.0";
+ version = "2.7.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
- sha256="1p2y6fhxfmb48nl03xdg62nfrwssaaiw10vzr194z6srcj90n2r7";
+ sha256="05j01v4hmw0vv5vcj11pbngl200b3j2yvawk08fw9a249jzx6v1a";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index c294647b35de..a647c84016ba 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "cimg-${version}";
- version = "1.7.9";
+ version = "2.5.5";
src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
- sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s";
+ sha256 = "12jwis90ijakfiqngcd8s4a22wzr32f6midszja9ry41ilv63nic";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix
index 995844524dcf..ae110846ff06 100644
--- a/pkgs/development/libraries/cmocka/default.nix
+++ b/pkgs/development/libraries/cmocka/default.nix
@@ -1,13 +1,13 @@
{ fetchurl, stdenv, cmake }:
stdenv.mkDerivation rec {
- name = "cmocka-${version}";
+ pname = "cmocka";
majorVersion = "1.1";
- version = "${majorVersion}.1";
+ version = "${majorVersion}.5";
src = fetchurl {
url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz";
- sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389";
+ sha256 = "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
index 56b23153dcf2..e663c87f799e 100644
--- a/pkgs/development/libraries/cpptest/default.nix
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "cpptest-1.1.2";
+ name = "cpptest-2.0.0";
src = fetchurl {
url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz";
- sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
+ sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index fb7ec512319e..f0f31ae1ffc4 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,27 +1,57 @@
-{ stdenv, fetchurl, python, pkgconfig
-, glib, icu, gobject-introspection }:
+{ stdenv
+, fetchgit
+, pkgconfig
+, glib
+, icu
+, gobject-introspection
+, dbus-glib
+, vala
+, python3
+, autoreconfHook
+}:
stdenv.mkDerivation rec {
- name = "dee-${version}";
- version = "1.2.7";
+ pname = "dee";
+ version = "unstable-2017-06-16";
- src = fetchurl {
- url = "https://launchpad.net/dee/1.0/${version}/+download/${name}.tar.gz";
- sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v";
+ outputs = [ "out" "dev" "py" ];
+
+ src = fetchgit {
+ url = "https://git.launchpad.net/ubuntu/+source/dee";
+ rev = "import/1.2.7+17.10.20170616-4ubuntu1";
+ sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394";
};
- buildInputs = [ glib gobject-introspection icu ];
- nativeBuildInputs = [ python pkgconfig ];
+ patches = [
+ "${src}/debian/patches/gtkdocize.patch"
+ "${src}/debian/patches/strict-prototype.patch"
+ "${src}/debian/patches/icu-pkg-config.patch"
+ ];
- NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6
+ nativeBuildInputs = [
+ pkgconfig
+ vala
+ autoreconfHook
+ gobject-introspection
+ python3
+ ];
- enableParallelBuilding = true;
+ buildInputs = [
+ glib
+ icu
+ dbus-glib
+ ];
+
+ configureFlags = [
+ "--disable-gtk-doc"
+ "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+ ];
meta = with stdenv.lib; {
description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
homepage = https://launchpad.net/dee;
license = licenses.lgpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ abbradar ];
+ maintainers = with maintainers; [ abbradar worldofpeace ];
};
}
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index a88b3f1b9b68..67a56855bb79 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -1,5 +1,8 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg
, guiSupport ? false, libX11
+
+ # see http://dlib.net/compile.html
+, avxSupport ? true
}:
stdenv.mkDerivation rec {
@@ -17,6 +20,8 @@ stdenv.mkDerivation rec {
rm -rf dlib/external
'';
+ cmakeFlags = [ "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
+
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11;
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 2a43cbe8ee53..681062cd6713 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -16,7 +16,7 @@ assert withFlint -> flint != null;
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "eclib";
- version = "20180815"; # upgrade might break the sage interface
+ version = "20190226"; # upgrade might break the sage interface
# sage tests to run:
# src/sage/interfaces/mwrank.py
# src/sage/libs/eclib
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "JohnCremona";
repo = "${pname}";
rev = "v${version}";
- sha256 = "12syn83lnzx0xc4r1v3glfimbzndyilkpdmx50xrihbjz1hzczif";
+ sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb";
};
buildInputs = [
pari
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 292fba1ace02..c0df404e60eb 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "enet-1.3.13";
+ name = "enet-1.3.14";
src = fetchurl {
url = "http://enet.bespin.org/download/${name}.tar.gz";
- sha256 = "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73";
+ sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq";
};
meta = {
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index f7968380e29b..306b4e22cfc9 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -75,7 +75,7 @@
, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394)
, libiconv ? null
#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
-#, libmfx ? null # Hardware acceleration vis libmfx
+, libmfx ? null # Hardware acceleration vis libmfx
, libmodplug ? null # ModPlug support
, libmysofa ? null # HRTF support via SOFAlizer
#, libnut ? null # NUT (de)muxer, native (de)muser exists
@@ -156,12 +156,13 @@
*
* Not packaged:
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
- * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame
+ * libnut libquvi nvenc opencl openh264 oss shine twolame
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
- * frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg,
- * pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
+ * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh
+ * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
+ * wavpack x265 xavs
*
* Not supported:
* stagefright-h264(android only)
@@ -231,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
- sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp";
+ sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr";
};
prePatch = ''
@@ -343,7 +344,7 @@ stdenv.mkDerivation rec {
(enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
(enableFeature (libiconv != null) "iconv")
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
- #(enableFeature (libmfx != null) "libmfx")
+ (enableFeature (if isLinux then libmfx != null else false) "libmfx")
(enableFeature (libmodplug != null) "libmodplug")
(enableFeature (libmysofa != null) "libmysofa")
#(enableFeature (libnut != null) "libnut")
@@ -416,6 +417,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]
+ ++ optional (isLinux && libmfx != null) libmfx
++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index f8343e668a67..5db1e0a47cfc 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "3.4.5";
- sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3";
+ branch = "3.4.6";
+ sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
})
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 738411d398df..d8a13a9c384d 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "4.1.1";
- sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c";
+ branch = "4.1.2";
+ sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
darwinFrameworks = [ Cocoa CoreMedia ];
})
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 91c384b249a4..a1d623c7b98d 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, vtk }:
stdenv.mkDerivation rec {
- version = "2.8.8";
+ version = "2.8.9";
name = "gdcm-${version}";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
- sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b";
+ sha256 = "1za252d1chv40d78bkjngrg1p2yx0vya8y9q3vqmz66ip2zilvx7";
};
dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index d4e7b8c5da42..247a74e3a325 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -6,6 +6,9 @@
, libsoup, libpulseaudio, libintl
, darwin, lame, mpg123, twolame
, gtkSupport ? false, gtk3 ? null
+, libXdamage
+, libXext
+, libXfixes
, ncurses
}:
@@ -49,6 +52,11 @@ stdenv.mkDerivation rec {
libdv libvpx speex flac taglib
cairo gdk_pixbuf aalib libcaca
libsoup libshout lame mpg123 twolame libintl
+ # TODO: Remove the comments once https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/e234932dc703e51a0e1aa3b9c408f12758b12335
+ # is merged and available in nixpkgs.
+ libXdamage # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553
+ libXext # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553
+ libXfixes # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553
ncurses
]
++ optional gtkSupport gtk3 # for gtksink
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
new file mode 100644
index 000000000000..6ab10c24d3dc
--- /dev/null
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, autoPatchelfHook, cmake, pkgconfig, libdrm, libpciaccess
+, libva , libX11, libXau, libXdmcp, libpthreadstubs
+}:
+
+stdenv.mkDerivation rec {
+ name = "intel-media-sdk-${version}";
+ version = "18.4.1";
+
+ src = fetchurl {
+ url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
+ sha256 = "0yqqw6hyjn28zk4f4wznqpyiz9vinnjj8067dim64bz1f4pjhyra";
+ };
+
+ # patchelf is needed for binaries in $out/share/samples
+ nativeBuildInputs = [ autoPatchelfHook cmake pkgconfig ];
+ buildInputs = [
+ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs
+ ];
+
+ enableParallelBuild = true;
+
+ meta = with stdenv.lib; {
+ description = "Intel Media SDK.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ midchildan ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index ce41ffa4929f..f240ad124c8b 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ )
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index f7fffa8b2987..6a7720b99bcc 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
stdenv.mkDerivation rec {
name = "libb2-${version}";
- version = "0.98";
+ version = "0.98.1";
- src = fetchurl {
- url = "https://blake2.net/${name}.tar.gz";
- sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal";
+ src = fetchFromGitHub {
+ owner = "BLAKE2";
+ repo = "libb2";
+ rev = "v${version}";
+ sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya";
};
preConfigure = ''
@@ -16,14 +18,15 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
- nativeBuildInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake libtool pkg-config ];
doCheck = true;
meta = with stdenv.lib; {
description = "The BLAKE2 family of cryptographic hash functions";
+ homepage = https://blake2.net/;
platforms = platforms.all;
- maintainers = with maintainers; [ dfoxfranke ];
+ maintainers = with maintainers; [ dfoxfranke dotlambda ];
license = licenses.cc0;
};
}
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 04e1af2326b6..8949ea8e390e 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }:
+{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
+, x11Support ? !stdenv.isDarwin, libX11, libXext
+}:
stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19";
@@ -13,8 +15,16 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ];
- propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]
- ++ stdenv.lib.optional stdenv.isDarwin libXext;
+ configureFlags = [
+ (if x11Support then "--enable-x11" else "--disable-x11")
+ ];
+
+ NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";
+
+ enableParallelBuilding = true;
+
+ propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
+ ++ stdenv.lib.optionals x11Support [ libX11 libXext];
postInstall = ''
mkdir -p $dev/bin
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index c0ec9d927a83..067144ddfa0c 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
stdenv.mkDerivation rec {
- version = "3.20.2";
+ version = "3.20.3";
name = "libdap-${version}";
nativeBuildInputs = [ bison flex ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.opendap.org/pub/source/${name}.tar.gz";
- sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0";
+ sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 59651af2b8cf..6a26910c8bd6 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libebml-${version}";
- version = "1.3.6";
+ pname = "libebml";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
- sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs";
+ sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index b2d9af657a93..bc371423e439 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
stdenv.mkDerivation rec {
- name = "libextractor-1.8";
+ name = "libextractor-1.9";
src = fetchurl {
url = "mirror://gnu/libextractor/${name}.tar.gz";
- sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2";
+ sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh";
};
preConfigure =
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index bbc694619d4c..6df996f30999 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -2,14 +2,14 @@
, libebml }:
stdenv.mkDerivation rec {
- name = "libmatroska-${version}";
- version = "1.4.9";
+ pname = "libmatroska";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libmatroska";
rev = "release-${version}";
- sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86";
+ sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix
new file mode 100644
index 000000000000..3c55a6b036cc
--- /dev/null
+++ b/pkgs/development/libraries/libmicrodns/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.0.10";
+ pname = "libmicrodns";
+
+ src = fetchFromGitHub {
+ owner = "videolabs";
+ repo = pname;
+ rev = version;
+ sha256 = "1xvl9k49ng35wbsqmnjnyqvkyjf8dcq2ywsq3jp3wh0rgmxhq2fh";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Minimal mDNS resolver library, used by VLC";
+ homepage = https://github.com/videolabs/libmicrodns;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.shazow ];
+ };
+}
diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix
index 10bd7af7fadd..d1ee30698a09 100644
--- a/pkgs/development/libraries/libmodbus/default.nix
+++ b/pkgs/development/libraries/libmodbus/default.nix
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68";
};
+ configureFlags = [
+ # when cross-compiling we assume that the host system will return a valid
+ # pointer for calls to malloc(0) or realloc(0)
+ # https://www.uclibc.org/FAQ.html#gnu_malloc
+ # https://www.gnu.org/software/autoconf/manual/autoconf.html#index-AC_005fFUNC_005fMALLOC-454
+ # the upstream source should be patched to avoid needing this
+ "ac_cv_func_malloc_0_nonnull=yes"
+ "ac_cv_func_realloc_0_nonnull=yes"
+ ];
+
meta = with stdenv.lib; {
description = "Library to send/receive data according to the Modbus protocol";
homepage = http://libmodbus.org/;
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 0a36b9bb2ddb..ae12bd03813c 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs =
[ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+ which
];
buildInputs =
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
patchPhase = ''
patchShebangs test
- substituteInPlace configure.ac --replace "which" "${which}/bin/which"
substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell}
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index ff7b7a1af1f3..fc753fe76696 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpqxx";
- version = "6.3.3";
+ version = "6.4.2";
src = fetchFromGitHub {
owner = "jtv";
repo = pname;
rev = version;
- sha256 = "1gfi4ghnhzlkdza2ifvg6b2rk5qn0swq7ykphwmwalb166vj2wlx";
+ sha256 = "1s9gbznhak4nvpv56v38pgyki37rlmr0rgc1249ahhv0yfbcf74j";
};
nativeBuildInputs = [ gnused python2 ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 96b926d3d2b9..4aa33236a9eb 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -2,14 +2,14 @@
autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
stdenv.mkDerivation rec {
- name = "libqalculate-${version}";
- version = "2.9.0";
+ pname = "libqalculate";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
- sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i";
+ sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q";
};
outputs = [ "out" "dev" "doc" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace libqalculate/Calculator.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
- --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"'
+ --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'' + stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/qalc.cc \
--replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 875e0a97ae2e..918335597c9b 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
- version = "2.18.0";
+ version = "2.19.0";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
- sha256 = "09s0rhjpvaa89767m58wk1bqcmdkjk7brwj32k083f2wsdbbzb11";
+ sha256 = "03ljn4igi8l1fd1nvpn448d3sqvxyl0r0l9sbkimlx77g52wjv2j";
};
buildInputs = [
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 7803b2a5ff11..f53db7241cf7 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
stdenv.mkDerivation rec {
- version = "1.1.0";
+ version = "2.0.0";
name = "libsoundio-${version}";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "libsoundio";
rev = "${version}";
- sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
+ sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b74..75df3477ba53 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "libtermkey-${version}";
- version = "0.20";
+ version = "0.22";
src = fetchzip {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz";
- sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx";
+ sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg";
};
makeFlags = [ "PREFIX=$(out)" ]
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 52f01229c4af..a0ec3b74cc17 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -1,27 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
-, glib, vala, dee, gobject-introspection, libdbusmenu
-, gtk3, intltool, gnome-common, python3, icu }:
+{ stdenv
+, fetchgit
+, pkgconfig
+, glib
+, vala
+, dee
+, gobject-introspection
+, libdbusmenu
+, gtk3
+, intltool
+, python3
+, autoreconfHook
+}:
stdenv.mkDerivation rec {
pname = "libunity";
- version = "7.1.4";
+ version = "unstable-2019-03-19";
- name = "${pname}-${version}";
+ outputs = [ "out" "dev" "py" ];
- outputs = [ "out" "dev" ];
-
- src = fetchurl {
- url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz";
- sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij";
+ src = fetchgit {
+ url = "https://git.launchpad.net/ubuntu/+source/libunity";
+ rev = "import/7.1.4+19.04.20190319-0ubuntu1";
+ sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
};
nativeBuildInputs = [
- autoconf
- automake
- gnome-common
+ autoreconfHook
gobject-introspection
intltool
- libtool
pkgconfig
python3
vala
@@ -32,17 +38,20 @@ stdenv.mkDerivation rec {
gtk3
];
- propagatedBuildInputs = [ dee libdbusmenu ];
+ propagatedBuildInputs = [
+ dee
+ libdbusmenu
+ ];
- preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+ preConfigure = ''
+ intltoolize
+ '';
configureFlags = [
"--disable-static"
- "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides"
+ "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
];
- NIX_LDFLAGS = "-L${icu}/lib";
-
meta = with stdenv.lib; {
description = "A library for instrumenting and integrating with all aspects of the Unity shell";
homepage = https://launchpad.net/libunity;
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 1293b0af8cce..12fd972b8719 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, gfortran, perl }:
let
- version = "4.2.3";
+ version = "4.3.4";
in stdenv.mkDerivation {
name = "libxc-${version}";
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
- sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02";
+ sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
};
buildInputs = [ gfortran ];
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 471789d3e0f6..44949cf2deb4 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libxl";
- version = "3.8.1";
+ version = "3.8.4";
src = fetchurl {
url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
- sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
+ sha256 = "0jnvc9ilir3lvs81l6ldnyf6jbfsy7bcs5pkc75qfnvz01y7p6as";
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
new file mode 100644
index 000000000000..9aa189586f05
--- /dev/null
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }:
+
+stdenv.mkDerivation rec {
+ pname = "libykclient";
+ version = "unstable-2019-03-18";
+ src = fetchFromGitHub {
+ owner = "Yubico";
+ repo = "yubico-c-client";
+ rev = "ad9eda6aac4c3f81784607c30b971f4a050b5c2e";
+ sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig help2man ];
+ buildInputs = [ curl ];
+
+ meta = with stdenv.lib; {
+ description = "Yubikey C client library";
+ homepage = https://developers.yubico.com/yubico-c-client;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 531261a58ca5..f9d07d8d7373 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -3,14 +3,14 @@
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
name = "live555-${version}";
- version = "2019.02.03";
+ version = "2019.03.06";
src = fetchurl { # the upstream doesn't provide a stable URL
urls = [
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
];
- sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw";
+ sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b";
};
postPatch = ''
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index f28ff1b0a21f..72743efeb8ef 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.13";
+ name = "matio-1.5.14";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
- sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy";
+ sha256 = "0vhzh0idzlm0m28gxsnv1dcfp0229vdj49d749qn4xfdyncbnfhb";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index c2a61ec6fc1c..972cc3e738c7 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mxml-${version}";
- version = "2.12";
+ version = "3.0";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = "mxml";
rev = "v${version}";
- sha256 = "1m8z503vnfpm576gjpp1h7zmx09n50if2i28v24yx80j820ip94s";
+ sha256 = "0madp2v2md3xq96aham91byns6qy4byd5pbg28q827fdahfhpmq7";
};
enableParallelBuilding = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A small XML library";
homepage = https://www.msweet.org/mxml/;
- license = licenses.lgpl2;
+ license = licenses.asl20;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 15c82cb12825..3ab1e0a79749 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }:
stdenv.mkDerivation rec {
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs";
};
+ patches = [
+ # remove on the next mtxclient update
+ (fetchpatch {
+ url = "https://github.com/Nheko-Reborn/mtxclient/commit/41314809da7eb17ec00cff1795af6a528c5e904a.diff";
+ sha256 = "17pzrkdhd4jr8xwd7hhyzak880k8yb9nkg3vcbyjfp5si89dha5j";
+ })
+ ];
+
postPatch = ''
ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
'';
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index eb737c0757d9..129cc7ed84c3 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -2,14 +2,14 @@
}:
stdenv.mkDerivation rec {
- name = "nlohmann_json-${version}";
- version = "3.5.0";
+ pname = "nlohmann_json";
+ version = "3.6.1";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji";
+ sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 1d92a15ce005..b667dea8d49f 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }:
stdenv.mkDerivation rec {
name = "nuspell-${version}";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "nuspell";
repo = "nuspell";
rev = "v${version}";
- sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j";
+ sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ boost icu ];
enableParallelBuilding = true;
- preBuild = ''
- ln -s ${catch2}/include/catch2/*.hpp tests/
+ postPatch = ''
+ rm -rf external/Catch2
+ ln -sf ${catch2.src} external/Catch2
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 773478f4dc03..829ecdb86e06 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -7,7 +7,7 @@
with lib;
let
- v = "0.10.1";
+ v = "0.10.2";
pname = "phonon-backend-vlc";
in
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
- sha256 = "0b87mzkw9fdkrwgnh1kw5i5wnrd05rl42hynlykb7cfymsk6v5h9";
+ sha256 = "163jqq5p9n0yfw2fqk0cqn3c6mqycxsvc4956zhkw5345g81a2a9";
};
buildInputs =
diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/development/libraries/physics/applgrid/bad_code.patch
index c1c8f618fbb3..e90000efe2db 100644
--- a/pkgs/development/libraries/physics/applgrid/bad_code.patch
+++ b/pkgs/development/libraries/physics/applgrid/bad_code.patch
@@ -37,3 +37,14 @@ index d25288e..be354df 100644
};
typedef double (igrid::*transform_t)(double) const;
+diff --git a/src/lumi_pdf.cxx b/src/lumi_pdf.cxx
+--- a/src/lumi_pdf.cxx
++++ b/src/lumi_pdf.cxx
+@@ -235,6 +235,6 @@ void lumi_pdf::write(const std::string& filename) const {
+ // std::string lumi_pdf::summary(std::ostream& s=std::cout) const {
+ std::string lumi_pdf::summary() const {
+ std::stringstream s;
+- s << "lumi_pdf::lumi_pdf() " << s << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
++ s << "lumi_pdf::lumi_pdf() " << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this;
+ return s.str();
+ }
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 32245929ce62..379c370e1fcc 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -64,7 +64,11 @@ let
qttools = [ ./qttools.patch ];
qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
- ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch;
+ ++ optionals stdenv.isDarwin [
+ ./qtwebengine-darwin-no-platform-check.patch
+ ./qtwebengine-darwin-sdk-10.10.patch
+ ./qtwebengine-darwin-old-sdk.patch
+ ];
qtwebkit = [ ./qtwebkit.patch ]
++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh
index dc1088fc371c..2ab3dd71c24f 100644
--- a/pkgs/development/libraries/qt-5/5.11/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh
@@ -1,2 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \
- -A '*.tar.xz' )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
new file mode 100644
index 000000000000..3e1a8762b361
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
@@ -0,0 +1,37 @@
+diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
+--- a/mkspecs/features/platform.prf
++++ b/mkspecs/features/platform.prf
+@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) {
+ return(false)
+ }
+ } else:osx {
+- !isMinXcodeVersion(7, 3) {
+- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.")
+- return(false)
+- }
+ !clang|intel_icc {
+ skipBuild("Qt WebEngine on macOS requires Clang.")
+ return(false)
+@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) {
+ skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.")
+ return(false)
+ }
+- !isMinOSXSDKVersion(10, 10): {
+- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+- return(false)
+- }
+ } else {
+ skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
+ return(false)
+diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
+--- a/src/core/config/mac_osx.pri
++++ b/src/core/config/mac_osx.pri
+@@ -5,8 +5,6 @@ load(functions)
+ # otherwise query for it.
+ QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
+ isEmpty(QMAKE_MAC_SDK_VERSION) {
+- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
+- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
+ }
+
+ QMAKE_CLANG_DIR = "/usr"
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch
new file mode 100644
index 000000000000..b065c2211017
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch
@@ -0,0 +1,21 @@
+diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
+--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
+@@ -45,7 +45,7 @@ NSString *RTCFieldTrialTrendlineFilterValue(
+ return [NSString stringWithFormat:format, windowSize, smoothingCoeff, thresholdGain];
+ }
+
+-void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) {
++void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) {
+ if (!fieldTrials) {
+ RTCLogWarning(@"No fieldTrials provided.");
+ return;
+diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
+--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
+@@ -40,4 +40,4 @@ RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue(
+ * Must be called before any other call into WebRTC. See:
+ * webrtc/system_wrappers/include/field_trial_default.h
+ */
+-RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials);
++RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials);
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index bc6432b5ca5a..6d0e241d7a54 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -63,7 +63,8 @@ let
qtwebengine = [
./qtwebengine-no-build-skip.patch
./qtwebengine-CVE-2019-5786.patch
- ];
+ ]
+ ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index b77a58cafa2e..aa3a0fe94898 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1,2 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ \
- -A '*.tar.xz' )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
new file mode 100644
index 000000000000..364330169bf1
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
@@ -0,0 +1,21 @@
+diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
+--- a/mkspecs/features/platform.prf
++++ b/mkspecs/features/platform.prf
+@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
+ } else:osx {
+ # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
+ !isMinXcodeVersion(8, 3, 3) {
+- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")
+- return(false)
+ }
+ !clang|intel_icc {
+ skipBuild("Qt WebEngine on macOS requires Clang.")
+@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) {
+ return(false)
+ }
+ !isMinOSXSDKVersion(10, 12): {
+- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+- return(false)
+ }
+ } else {
+ skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh
index ee3a5ddf8deb..bb9eb66a01dc 100644
--- a/pkgs/development/libraries/qt-5/5.6/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh
@@ -1,3 +1,2 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/ \
- http://download.qt.io/community_releases/5.6/5.6.3/ \
- -A '*.tar.xz' )
+ http://download.qt.io/community_releases/5.6/5.6.3/ )
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index 589f175efd9c..be84691e6c33 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -43,7 +43,9 @@ let
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qttools = [ ./qttools.patch ];
- qtwebengine = [ ./qtwebengine-no-build-skip.patch ];
+ qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
+ ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
+ ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ];
qtvirtualkeyboard = [
(fetchpatch {
diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh
index e631d3ae9b00..17ebe1e532df 100644
--- a/pkgs/development/libraries/qt-5/5.9/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh
@@ -1,2 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \
- -A '*.tar.xz' )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch
new file mode 100644
index 000000000000..cf082cddd11a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch
@@ -0,0 +1,38 @@
+Fix a following build error:
+
+In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:
+In file included from ../../3rdparty/chromium/base/bind.h:8:
+../../3rdparty/chromium/base/bind_internal.h:214:31: error: cannot initialize a parameter of type 'NSError *' with an lvalue of type 'const long'
+ return (receiver.*method)(std::forward(args)...);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../3rdparty/chromium/base/bind_internal.h:285:20: note: in instantiation of function template specialization 'base::internal::FunctorTraits::Invoke' requested here
+ return Traits::Invoke(std::forward(functor),
+ ^
+../../3rdparty/chromium/base/bind_internal.h:361:43: note: in instantiation of function template specialization 'base::internal::InvokeHelper::MakeItSo' requested here
+ return InvokeHelper::MakeItSo(
+ ^
+../../3rdparty/chromium/base/bind_internal.h:339:12: note: in instantiation of function template specialization 'base::internal::Invoker, long>, void ()>::RunImpl, long> &, 0, 1>' requested here
+ return RunImpl(storage->functor_,
+ ^
+../../3rdparty/chromium/base/bind.h:62:45: note: in instantiation of member function 'base::internal::Invoker, long>, void ()>::Run' requested here
+ PolymorphicInvoke invoke_func = &Invoker::Run;
+ ^
+../../3rdparty/chromium/base/bind.h:77:10: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here
+ return BindRepeating(std::forward(functor),
+ ^
+../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:241:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here
+ base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
+
+--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
+@@ -239,7 +239,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
+- base::Unretained(this), nil));
++ base::Unretained(this), nullptr));
+ }
+ }
+
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch
new file mode 100644
index 000000000000..7156c41c5ec1
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch
@@ -0,0 +1,50 @@
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -194,9 +194,6 @@ defineTest(runConfigure) {
+ } else {
+ log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}")
+ }
+- !isMinOSXSDKVersion(10, 10, 3) {
+- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}")
+- }
+ }
+ }
+
+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
+--- a/mkspecs/features/functions.prf
++++ b/mkspecs/features/functions.prf
+@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) {
+ return(false)
+ }
+ } else:osx {
+- !isMinXcodeVersion(5, 1) {
+- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
+- return(false)
+- }
+ !clang|intel_icc {
+ skipBuild("Qt WebEngine on macOS requires Clang.")
+ return(false)
+@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) {
+ skipBuild("Qt WebEngine requires OS X version 10.10 or newer.")
+ return(false)
+ }
+- !isMinOSXSDKVersion(10, 10): {
+- skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+- return(false)
+- }
+ } else {
+ skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.")
+ return(false)
+diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
+--- a/src/core/config/mac_osx.pri
++++ b/src/core/config/mac_osx.pri
+@@ -5,8 +5,6 @@ load(functions)
+ # otherwise query for it.
+ QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
+ isEmpty(QMAKE_MAC_SDK_VERSION) {
+- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
+- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
+ }
+
+ QMAKE_CLANG_DIR = "/usr"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index ddb828323371..91b7acf43654 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -67,32 +67,12 @@ qtModule {
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
''
+ optionalString stdenv.isDarwin (''
- # Remove annoying xcode check
- substituteInPlace mkspecs/features/platform.prf \
- --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \
- --replace "/usr/bin/xcodebuild" "xcodebuild"
-
- substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \
- --replace "/usr/bin/xcode-select" "xcode-select"
-
substituteInPlace src/core/config/mac_osx.pri \
- --replace /usr ${stdenv.cc} \
- --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false
-
+ --replace /usr ${stdenv.cc}
''
- # TODO remove when new Apple SDK is in
- + (if lib.versionOlder qtCompatVersion "5.11" then ''
- substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \
- --replace "NSArray*" "NSArray*"
- substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \
- --replace "NSDictionary*" "NSDictionary*" \
- --replace "NSArray*" "NSArray*" \
- --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
- '' else ''
- substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \
- --replace "NSDictionary *" "NSDictionary*"
- substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \
- --replace "NSDictionary *" "NSDictionary*"
+ + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") ''
+ substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
+ --replace '$sysroot/usr' "${darwin.xnu}"
'')
+ ''
@@ -114,9 +94,6 @@ print('sdk_platform_path=""')
print('sdk_build="17B41"')
EOF
- substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
- --replace '$sysroot/usr' "${darwin.xnu}"
-
# Apple has some secret stuff they don't share with OpenBSM
substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index d7967d409792..840891d55ef9 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rdkafka-${version}";
- version = "0.11.6";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
- sha256 = "17fah3x71ipnzvlj0yg8hfmqkk91s942z34p681r4k8giv7avm30";
+ sha256 = "1k4lk2vvvni87brs3j51by3j69ff2892jiq2f4979sxncq0apzlg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index 7a653a58eb2a..40dbfc53e2cb 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -8,21 +8,20 @@
, ocl-icd
, opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL
-, gtest
}:
stdenv.mkDerivation rec {
- name = "clblas-${version}";
+ name = "clblas-${version}";
version = "2.12";
src = fetchFromGitHub {
- owner = "clMathLibraries";
+ owner = "clMathLibraries";
repo = "clBLAS";
rev = "v${version}";
sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
- };
+ };
- patches = [ ./platform.patch ];
+ patches = [ ./platform.patch ];
postPatch = ''
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
- "-DUSE_SYSTEM_GTEST=ON"
+ "-DBUILD_TEST=OFF"
];
buildInputs = [
@@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
blas
python
boost
- gtest
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
ocl-icd
opencl-headers
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/clMathLibraries/clBLAS";
description = "A software library containing BLAS functions written in OpenCL";
longDescription = ''
- This package contains a library of BLAS functions on top of OpenCL.
+ This package contains a library of BLAS functions on top of OpenCL.
'';
license = licenses.asl20;
maintainers = with maintainers; [ artuuge ];
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 0801238fb121..1e166427a265 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -6,19 +6,19 @@
stdenvNoCC.mkDerivation rec {
name = "mkl-${version}";
version = "${date}.${rel}";
- date = "2019.0";
- rel = "117";
+ date = "2019.3";
+ rel = "199";
src = if stdenvNoCC.isDarwin
then
(fetchurl {
- url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13565/m_mkl_${version}.dmg";
- sha256 = "1f1jppac7vqwn00hkws0p4njx38ajh0n25bsjyb5d7jcacwfvm02";
+ url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
+ sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
})
else
(fetchurl {
- url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz";
- sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf";
+ url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_${version}.tgz";
+ sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6";
});
buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ];
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
'' else ''
rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
- rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${rel}.x86_64.rpm
+ rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm
'';
installPhase = if stdenvNoCC.isDarwin then ''
@@ -60,8 +60,8 @@ stdenvNoCC.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = if stdenvNoCC.isDarwin
- then "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw"
- else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a";
+ then "0rwm46v9amq2clm6wxhr98zzbafr485dz05pihlqsbrbabmlfw30"
+ else "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw";
meta = with stdenvNoCC.lib; {
description = "Intel Math Kernel Library";
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
new file mode 100644
index 000000000000..40d272fd07d6
--- /dev/null
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+ name = "spirv-headers-${version}";
+ version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit
+
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Headers";
+ rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS
+ sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Machine-readable components of the Khronos SPIR-V Registry";
+ license = licenses.mit;
+ maintainers = [ maintainers.ralith ];
+ };
+}
diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index 7501f9ab6f15..0ca382baeca3 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
+, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
let
version = "4.2.0";
pname = "tepl";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
libxml2
gtksourceview4
libuchardet
- gnome3.gtk
+ gtk3
];
doCheck = false;
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index 57a1cbf73c2c..b80984303d76 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl }:
let
- version = "2.0.2";
+ version = "2.1.0";
in
stdenv.mkDerivation rec {
name = "uthash-${version}";
src = fetchurl {
url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
- sha256 = "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl";
+ sha256 = "17k6k97n20jpi9zj3lzvqfw8pv670r6rdqrjf8vrbx6hcj7csb0m";
};
dontBuild = false;
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index c93ba1b12909..5a3216583085 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "vulkan-headers-${version}";
- version = "1.1.85";
+ version = "1.1.101.0";
buildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
- rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0";
- sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
+ rev = "sdk-${version}";
+ sha256 = "1rrpkibi4lnd9j63aarjk74z0xf4sy30zh8psq1vj92r21hfjr6m";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 6f720857f7cf..04266361ea52 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -2,7 +2,7 @@
, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
let
- version = "1.1.85";
+ version = "1.1.101.0";
in
assert version == vulkan-headers.version;
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
- rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c";
- sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj";
+ rev = "sdk-${version}";
+ sha256 = "0x891bha9mlsh4cvq59d1qnb4fnalwf6ml2b9y221cr7hikilamw";
};
nativeBuildInputs = [ pkgconfig ];
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- postInstall = ''
- cp -r "${vulkan-headers}/include" "$dev"
- '';
-
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = https://www.lunarg.com;
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
new file mode 100644
index 000000000000..5d7d0e664c64
--- /dev/null
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, asciidoc, libxslt, docbook_xsl
+, pam, yubikey-personalization, libyubikey, libykclient }:
+
+stdenv.mkDerivation rec {
+ pname = "yubico-pam";
+ version = "unstable-2019-03-19";
+ src = fetchFromGitHub {
+ owner = "Yubico";
+ repo = pname;
+ rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704";
+ sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
+ buildInputs = [ pam yubikey-personalization libyubikey libykclient ];
+
+ meta = with stdenv.lib; {
+ description = "Yubico PAM module";
+ homepage = https://developers.yubico.com/yubico-pam;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index face797fe2a3..3343f22b7b0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -10,11 +10,13 @@ in
{
stumpwm = x:{
overrides = y: (x.overrides y) // {
+ linkedSystems = [];
preConfigure = ''
export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
'';
postInstall = ''
- export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'"
+ export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \
+ '(function stumpwm:stumpwm)' '$linkedSystems'"
"$out/bin/stumpwm-lisp-launcher.sh"
cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin"
diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix
new file mode 100644
index 000000000000..a6f84bc86d7d
--- /dev/null
+++ b/pkgs/development/misc/msp430/gcc-support.nix
@@ -0,0 +1,31 @@
+{ stdenvNoCC, fetchzip }:
+
+let
+ mspgccVersion = "6_1_0_0";
+ version = "1.206";
+in stdenvNoCC.mkDerivation {
+ name = "msp430-gcc-support-files-${version}";
+ src = fetchzip {
+ url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${mspgccVersion}/exports/msp430-gcc-support-files-${version}.zip";
+ sha256 = "0h297jms3gkmdcqmfpr3cg6v9wxnms34qbwvwl2fkmrz20vk766q";
+ };
+
+ buildCommand = ''
+ find $src/include -name '*.ld' | xargs install -Dm0644 -t $out/lib
+ find $src/include -name '*.h' | xargs install -Dm0644 -t $out/include
+ install -Dm0644 -t $out/include $src/include/devices.csv
+
+ # appease bintoolsWrapper_addLDVars, search path needed for ld scripts
+ touch $out/lib/lib
+ '';
+
+ meta = with stdenvNoCC.lib; {
+ description = ''
+ Development headers and linker scripts for TI MSP430 microcontrollers
+ '';
+ homepage = https://www.ti.com/tool/msp430-gcc-opensource;
+ license = licenses.bsd3;
+ platforms = [ "msp430-none" ];
+ maintainers = with maintainers; [ aerialx ];
+ };
+}
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
new file mode 100644
index 000000000000..0456c8eae769
--- /dev/null
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libusb, readline ? null }:
+
+let
+ version = "0.25";
+in stdenv.mkDerivation {
+ name = "mspdebug-${version}";
+ src = fetchFromGitHub {
+ owner = "dlbeer";
+ repo = "mspdebug";
+ rev = "v${version}";
+ sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
+ };
+
+ buildInputs = [ libusb readline ];
+ makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++
+ (if readline == null then [ "WITHOUT_READLINE=1" ] else []);
+
+ meta = with stdenv.lib; {
+ description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
+ homepage = https://dlbeer.co.nz/mspdebug/;
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ aerialx ];
+ };
+}
diff --git a/pkgs/development/misc/msp430/newlib.nix b/pkgs/development/misc/msp430/newlib.nix
new file mode 100644
index 000000000000..4ea98bfc8b2e
--- /dev/null
+++ b/pkgs/development/misc/msp430/newlib.nix
@@ -0,0 +1,25 @@
+{ stdenvNoCC, lndir, newlib, msp430GccSupport }:
+
+stdenvNoCC.mkDerivation {
+ name = "msp430-${newlib.name}";
+ inherit newlib;
+ inherit msp430GccSupport;
+
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+
+ buildCommand = ''
+ mkdir $out
+ ${lndir}/bin/lndir -silent $newlib $out
+ ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
+ ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
+ '';
+
+ passthru = {
+ inherit (newlib) incdir libdir;
+ };
+
+ meta = {
+ platforms = [ "msp430-none" ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix
index b37dd413f693..1213120ce1cb 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -1,43 +1,22 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2,
- enableGtkSupport ? true # Whether to compile with support for Gtk
- # integration (library file cairo2_gtk). Depends
- # on lablgtk and gtk2.
+{ stdenv, lib, fetchurl, buildDunePackage
+, pkgconfig, cairo
}:
-let
- inherit (stdenv.lib) optionals;
- version = "0.5";
-in
-
-stdenv.mkDerivation {
-
- name = "ocaml${ocaml.version}-cairo2-${version}";
+buildDunePackage rec {
+ pname = "cairo2";
+ version = "0.6";
src = fetchurl {
- url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz";
- sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj";
+ url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
+ sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml findlib ocamlbuild cairo ]
- ++ optionals enableGtkSupport [ gtk2 ];
+ buildInputs = [ cairo ];
- # lablgtk2 is marked as a propagated build input since loading the
- # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as
- # well.
- propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ];
+ doCheck = !stdenv.isDarwin;
- createFindlibDestdir = true;
-
- configurePhase = "ocaml setup.ml -configure --prefix $out"
- + (if enableGtkSupport then " --enable-lablgtk2"
- else " --disable-lablgtk2");
-
- buildPhase = "ocaml setup.ml -build";
-
- installPhase = "ocaml setup.ml -install";
-
- meta = with stdenv.lib; {
+ meta = {
homepage = "https://github.com/Chris00/ocaml-cairo";
description = "Binding to Cairo, a 2D Vector Graphics Library";
longDescription = ''
@@ -46,8 +25,7 @@ stdenv.mkDerivation {
the X Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output.
'';
- license = licenses.lgpl3;
- platforms = ocaml.meta.platforms or [];
- maintainers = [ maintainers.jirkamarsik ];
+ license = lib.licenses.lgpl3;
+ maintainers = with lib.maintainers; [ jirkamarsik vbgl ];
};
}
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index de759e922781..dba3e2569574 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -3,11 +3,11 @@
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-extlib-1.7.5";
+ name = "ocaml${ocaml.version}-extlib-1.7.6";
src = fetchurl {
- url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz;
- sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
+ url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz;
+ sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz";
};
buildInputs = [ ocaml findlib cppo ];
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 504e83734d88..988b7147fcb4 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -324,10 +324,11 @@ rec {
pname = "re2";
hash = "0bl65d0nmvr7k1mkkcc4aai86l5qzgn1xxwmszshpwhaz87cqghd";
propagatedBuildInputs = [ core_kernel ];
- meta = {
- description = "OCaml bindings for RE2";
- broken = stdenv.isDarwin;
- };
+ prePatch = ''
+ substituteInPlace src/re2_c/jbuild --replace 'CXX=g++' 'CXX=c++'
+ substituteInPlace src/jbuild --replace '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2)))' '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2) (-x c++)))'
+ '';
+ meta.description = "OCaml bindings for RE2";
};
core_extended = janePackage {
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 26131d0a98c8..7c6198add622 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -1,18 +1,10 @@
-{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }:
+{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }:
-if !lib.versionAtLeast ocaml.version "4.05"
-then throw "lablgtk3 is not available for OCaml ${ocaml.version}"
-else
-
-# This package uses the dune.configurator library
-# It thus needs said library to be compiled with this OCaml compiler
-let __dune = dune; in
-let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in
-
-stdenv.mkDerivation rec {
+buildDunePackage rec {
version = "3.0.beta5";
pname = "lablgtk3";
- name = "ocaml${ocaml.version}-${pname}-${version}";
+
+ minimumOCamlVersion = "4.05";
src = fetchFromGitHub {
owner = "garrigue";
@@ -22,17 +14,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ocaml findlib dune gtk3 ];
+ buildInputs = [ gtk3 ];
propagatedBuildInputs = [ cairo2 ];
- buildPhase = "dune build -p ${pname}";
- inherit (dune) installPhase;
-
meta = {
description = "OCaml interface to gtk+-3";
homepage = "http://lablgtk.forge.ocamlcore.org/";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
index 7e8807576eeb..a266e57dd859 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
@@ -1,9 +1,8 @@
-{ stdenv, ocaml, gtksourceview, lablgtk3 }:
+{ buildDunePackage, gtksourceview, lablgtk3 }:
-stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}";
- buildPhase = "dune build -p lablgtk3-sourceview3";
+buildDunePackage rec {
+ pname = "lablgtk3-sourceview3";
buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
propagatedBuildInputs = [ lablgtk3 ];
- inherit (lablgtk3) src version meta nativeBuildInputs installPhase;
+ inherit (lablgtk3) src version meta nativeBuildInputs;
}
diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
new file mode 100644
index 000000000000..b316540e3d05
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";
+
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-lacaml";
+ version = "11.0.3";
+
+ src = fetchFromGitHub {
+ owner = "mmottl";
+ repo = "lacaml";
+ rev = "${version}";
+ sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
+ };
+
+ buildInputs =
+ [ ocaml findlib dune base stdio liblapack blas ] ++
+ stdenv.lib.optionals stdenv.isDarwin
+ [ darwin.apple_sdk.frameworks.Accelerate ];
+
+ inherit (dune) installPhase;
+
+ meta = with stdenv.lib; {
+ homepage = http://mmottl.github.io/lacaml;
+ description = "OCaml bindings for BLAS and LAPACK";
+ license = licenses.lgpl21Plus;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = [ maintainers.rixed ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix
index 129f9dd7289f..0b8f83a1ea3e 100644
--- a/pkgs/development/ocaml-modules/stdint/default.nix
+++ b/pkgs/development/ocaml-modules/stdint/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune }:
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-stdint-${version}";
- version = "0.5.0";
+ pname = "stdint";
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "andrenth";
repo = "ocaml-stdint";
rev = version;
- sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7";
+ sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
- configurePhase = "ocaml setup.ml -configure --prefix $out";
+ buildInputs = [ ocaml findlib dune ];
- createFindlibDestdir = true;
+ buildPhase = "dune build -p ${pname}";
+ inherit (dune) installPhase;
meta = {
description = "Various signed and unsigned integers for OCaml";
diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix
index e8eabcf43b30..117277fe1b6e 100644
--- a/pkgs/development/ocaml-modules/syslog/default.nix
+++ b/pkgs/development/ocaml-modules/syslog/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ];
+ buildFlags = [ "all" "opt" ];
+
createFindlibDestdir = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix
index bb16ac46f991..d454d244959f 100644
--- a/pkgs/development/ocaml-modules/zmq/default.nix
+++ b/pkgs/development/ocaml-modules/zmq/default.nix
@@ -1,15 +1,8 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }:
+{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }:
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
-then throw "zmq is not available for OCaml ${ocaml.version}"
-else
-
-let __dune = dune; in
-let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; };
-in
-
-stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-zmq-${version}";
+buildDunePackage rec {
+ minimumOCamlVersion = "4.03";
+ pname = "zmq";
version = "20180726";
src = fetchFromGitHub {
owner = "issuu";
@@ -18,23 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf";
};
- patches = [
- ./ocaml-zmq-issue43.patch
- ];
-
- buildInputs = [ ocaml findlib dune czmq ];
+ buildInputs = [ czmq ];
propagatedBuildInputs = [ stdint ];
- buildPhase = "dune build -p zmq";
-
- inherit (dune) installPhase;
-
- meta = with stdenv.lib; {
+ meta = {
description = "ZeroMQ bindings for OCaml";
- license = licenses.mit;
- maintainers = with maintainers; [ akavel ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ akavel ];
inherit (src.meta) homepage;
- inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch
deleted file mode 100644
index 0d01e8b45f39..000000000000
--- a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100
-+++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100
-@@ -35,7 +35,7 @@
- #include "socket.h"
- #include "msg.h"
-
--#include
-+#include
-
- /**
- * Version
diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix
new file mode 100644
index 000000000000..6fe41e404192
--- /dev/null
+++ b/pkgs/development/python-modules/Markups/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python-markdown-math
+, markdown
+, docutils
+, pygments
+}:
+
+buildPythonPackage rec {
+ pname = "Markups";
+ version = "3.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39";
+ };
+
+ checkInputs = [ markdown docutils pygments ];
+ propagatedBuildInputs = [ python-markdown-math ];
+
+ meta = {
+ description = "A wrapper around various text markup languages.";
+ homepage = https://github.com/retext-project/pymarkups;
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ klntsky ];
+ };
+}
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
new file mode 100644
index 000000000000..39545e61ecdc
--- /dev/null
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, fetchPypi, attrs, protobuf, zeroconf }:
+
+buildPythonPackage rec {
+ pname = "aioesphomeapi";
+ version = "1.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "16ywa7yggmsx8m2r9azdq7w9fxjh736g1vd1aibgh24g7srhwwhj";
+ };
+
+ propagatedBuildInputs = [ attrs protobuf zeroconf ];
+
+ meta = {};
+}
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 54b6e87a1cea..29fd1f592f30 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "amqp";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb";
+ sha256 = "043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7";
};
checkInputs = [ pytest case pytest-sugar ];
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 1ec50ef7780b..dff12fcaf92c 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.7.8";
+ version = "2.7.9";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
- sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx";
+ sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 0ba779ec93e5..90fe66bf4e92 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "astropy";
- version = "3.1.1";
+ version = "3.1.2";
disabled = !isPy3k; # according to setup.py
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0fzm2q922qi68ns5biy807dzmgz1i9gqdh73lcafs0gfk8zyc9v5";
+ sha256 = "1plyx3gcsff02g4yclvhlcdj8bh1lnm98d7h6wdabl36jvnahy2a";
};
propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index cf619e6021ef..8906b72dcca0 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "awkward";
- version = "0.8.4";
+ version = "0.8.7";
src = fetchPypi {
inherit pname version;
- sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2";
+ sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
new file mode 100644
index 000000000000..2fd58010f5a7
--- /dev/null
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, gym
+, scipy
+, tqdm
+, joblib
+, dill
+, progressbar2
+, cloudpickle
+, click
+, pyzmq
+, tensorflow
+, mpi4py
+}:
+
+buildPythonPackage rec {
+ pname = "baselines";
+ version = "0.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";
+ };
+
+ patches = [
+ # already fixed upstream
+ ./fix-dep-names.patch
+ ];
+
+ propagatedBuildInputs = [
+ gym
+ scipy
+ tqdm
+ joblib
+ pyzmq
+ dill
+ progressbar2
+ mpi4py
+ cloudpickle
+ tensorflow
+ click
+ ];
+
+ # fails to create a daemon, probably because of sandboxing
+ doCheck = false;
+
+ checkInputs = [
+ pytest
+ ];
+
+ meta = with lib; {
+ description = "High-quality implementations of reinforcement learning algorithms";
+ homepage = https://github.com/openai/baselines;
+ license = licenses.mit;
+ maintainers = with maintainers; [ timokau ];
+ };
+}
diff --git a/pkgs/development/python-modules/baselines/fix-dep-names.patch b/pkgs/development/python-modules/baselines/fix-dep-names.patch
new file mode 100644
index 000000000000..5b0de29247af
--- /dev/null
+++ b/pkgs/development/python-modules/baselines/fix-dep-names.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index bf8badc..570be20 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,11 +10,11 @@ setup(name='baselines',
+ packages=[package for package in find_packages()
+ if package.startswith('baselines')],
+ install_requires=[
+- 'gym[mujoco,atari,classic_control,robotics]',
++ 'gym',
+ 'scipy',
+ 'tqdm',
+ 'joblib',
+- 'zmq',
++ 'pyzmq',
+ 'dill',
+ 'progressbar2',
+ 'mpi4py',
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index 7a17fd0f1d0a..3882af3a67df 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -2,42 +2,75 @@
, buildPythonPackage
, fetchFromGitHub
, nose
+, pylibmc
+, memcached
+, redis
+, pymongo
, mock
, webtest
, sqlalchemy
, pycrypto
+, cryptography
, isPy27
+, isPy3k
, funcsigs
, pycryptopp
}:
buildPythonPackage rec {
pname = "Beaker";
- version = "1.8.0";
+ version = "1.10.1";
# The pypy release do not contains the tests
src = fetchFromGitHub {
owner = "bbangert";
repo = "beaker";
rev = "${version}";
- sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g";
+ sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7";
};
- buildInputs =
- [ nose
- mock
- webtest
- ];
propagatedBuildInputs = [
sqlalchemy
pycrypto
+ cryptography
] ++ lib.optionals (isPy27) [
funcsigs
pycryptopp
];
+ checkInputs = [
+ nose
+ mock
+ webtest
+ pylibmc
+ memcached
+ redis
+ pymongo
+ ];
+
+
+ # Can not run memcached tests because it immediately tries to connect
+ postPatch = lib.optionalString isPy3k ''
+ substituteInPlace setup.py \
+ --replace "python-memcached" "python3-memcached"
+ '' + ''
+
+ rm tests/test_memcached.py
+ '';
+
+ # Disable external tests because they need to connect to a live database.
+ # Also disable a test in test_cache.py called "test_upgrade" because
+ # it currently fails on darwin.
+ # Please see issue https://github.com/bbangert/beaker/issues/166
+ checkPhase = ''
+ nosetests \
+ -e ".*test_ext_.*" \
+ -e "test_upgrade" \
+ -vv tests
+ '';
+
meta = {
description = "A Session and Caching library with WSGI Middleware";
maintainers = with lib.maintainers; [ garbas domenkozar ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index cd98a8da710a..268c08ced848 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
+{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
- isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
+ isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized,
+ glibcLocales }:
let
withPlugins = plugins: buildPythonPackage {
@@ -24,12 +25,21 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "1.8.1";
+ version = "2.1.0";
- src = fetchPypi {
+ /*src = fetchPypi {
inherit pname version;
- sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
- };
+ sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w";
+ };*/
+ # Temporarily use GitHub source because PyPi archive is missing some files
+ # needed for the tests to pass. This has been fixed upstream.
+ # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d
+ src = fetchFromGitHub {
+ owner = "buildbot";
+ repo = "buildbot";
+ rev = "v${version}";
+ sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65";
+ } + "/master";
propagatedBuildInputs = [
# core
@@ -63,6 +73,7 @@ let
flake8
buildbot-worker
buildbot-pkg
+ parameterized
glibcLocales
];
@@ -84,6 +95,8 @@ let
export PATH="$out/bin:$PATH"
'';
+ disabled = !isPy3k;
+
passthru = {
inherit withPlugins;
};
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 480bed2805ee..35524040da99 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
- version = "1.8.1";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
+ sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 4bcaa965d2f3..2f73fbc81a4f 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -10,7 +10,8 @@
src = fetchPypi {
inherit pname version format;
- sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
+ python = "py3";
+ sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v";
};
meta = with lib; {
@@ -27,7 +28,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
+ sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -47,7 +48,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
+ sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -67,7 +68,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
+ sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -87,7 +88,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
+ sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c";
};
propagatedBuildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 8e49d085fbd1..f888448db218 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -2,11 +2,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
- version = "1.8.1";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
+ sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 64f649ad28ab..3fc4c3e84ed4 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -25,12 +25,19 @@ buildPythonPackage rec {
-k "not test_nightshade_image"
'';
- buildInputs = [ cython glibcLocales ];
- LC_ALL = "en_US.UTF-8";
+ nativeBuildInputs = [
+ cython
+ geos # for geos-config
+ proj
+ ];
+
+ buildInputs = [
+ geos proj
+ ];
propagatedBuildInputs = [
# required
- six pyshp shapely geos proj numpy
+ six pyshp shapely numpy
# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index 05fe33f7e2eb..a40238412c6d 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "cassandra-driver";
- version = "3.16.0";
+ version = "3.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22";
+ sha256 = "1z49z6f9rj9kp1v03s1hs1rg8cj49rh0yk0fc2qi57w7slgy2hkd";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index c22bb427a349..404ead243a98 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -4,13 +4,18 @@
buildPythonPackage rec {
pname = "celery";
- version = "4.3.0rc1";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf";
+ sha256 = "4c4532aa683f170f40bd76f928b70bc06ff171a959e06e71bf35f2f9d6031ef9";
};
+ postPatch = ''
+ substituteInPlace requirements/test.txt \
+ --replace "pytest>=4.3.1,<4.4.0" pytest
+ '';
+
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index 104bdb86bf00..41e653354e7b 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Chameleon";
- version = "3.5";
+ version = "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb";
+ sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix
new file mode 100644
index 000000000000..daeb6ca45267
--- /dev/null
+++ b/pkgs/development/python-modules/cherrypy/17.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi
+, setuptools_scm
+, cheroot, contextlib2, portend, routes, six, zc_lockfile
+, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt
+}:
+
+buildPythonPackage rec {
+ pname = "cherrypy";
+ version = "17.4.1";
+
+ src = fetchPypi {
+ pname = "CherryPy";
+ inherit version;
+ sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
+ };
+
+ propagatedBuildInputs = [
+ cheroot contextlib2 portend routes six zc_lockfile
+ ];
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ checkInputs = [
+ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ homepage = https://www.cherrypy.org;
+ description = "A pythonic, object-oriented HTTP framework";
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 4a860c5510ca..b39353f649d1 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,54 +1,40 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
-, cheroot, contextlib2, portend, routes, six
-, setuptools_scm, zc_lockfile, more-itertools
-, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
-, backports_functools_lru_cache, requests_toolbelt, pytest-services
+, setuptools_scm
+, cheroot, portend, more-itertools, zc_lockfile, routes
+, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
}:
-let
- srcInfo = if isPy3k then {
- version = "18.1.0";
- sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615";
- } else {
- version = "17.4.1";
- sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
- };
-in buildPythonPackage rec {
- pname = "CherryPy";
- inherit (srcInfo) version;
+buildPythonPackage rec {
+ pname = "cherrypy";
+ version = "18.1.1";
+
+ disabled = !isPy3k;
src = fetchPypi {
- inherit pname;
- inherit (srcInfo) version sha256;
+ pname = "CherryPy";
+ inherit version;
+ sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b";
};
- propagatedBuildInputs = if isPy3k then [
+ propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
# optional
routes
- ] else [
- cheroot contextlib2 portend routes six zc_lockfile
];
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
- checkInputs = if isPy3k then [
+ checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
- ] else [
- backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
];
checkPhase = ''
- # 3 out of 5 SignalHandlingTests need network access
- # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306
- # ...and skipping it makes 2 other tests fail
- LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \
- and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion"
+ pytest
'';
meta = with lib; {
- homepage = "http://www.cherrypy.org";
+ homepage = https://www.cherrypy.org;
description = "A pythonic, object-oriented HTTP framework";
license = licenses.bsd3;
};
diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix
index 27ee2fc82f9e..b378c901fad8 100644
--- a/pkgs/development/python-modules/contextvars/default.nix
+++ b/pkgs/development/python-modules/contextvars/default.nix
@@ -2,16 +2,14 @@
buildPythonPackage rec {
pname = "contextvars";
- version = "2.3";
+ version = "2.4";
disabled = !isPy36;
src = fetchPypi {
inherit pname version;
- sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
+ sha256 = "f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e";
};
- # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9
- patches = [ ./immutables_version.patch ];
propagatedBuildInputs = [ immutables ];
meta = {
diff --git a/pkgs/development/python-modules/contextvars/immutables_version.patch b/pkgs/development/python-modules/contextvars/immutables_version.patch
deleted file mode 100644
index 733c0502a665..000000000000
--- a/pkgs/development/python-modules/contextvars/immutables_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py 2018-07-30 15:40:14.000000000 +0000
-+++ ./setup.py 2019-02-12 18:33:24.984430303 +0000
-@@ -17,7 +17,7 @@
- packages=['contextvars'],
- provides=['contextvars'],
- install_requires=[
-- 'immutables==0.6',
-+ 'immutables>=0.6',
- ],
- license='Apache License, Version 2.0',
- classifiers=[
diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 381c114b44e4..45a9920dbe2e 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }:
buildPythonPackage rec {
pname = "cssselect2";
@@ -9,11 +9,21 @@ buildPythonPackage rec {
sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab";
};
+ # We're not interested in code quality tests
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pytest-cov" "" \
+ --replace "pytest-flake8" "" \
+ --replace "pytest-isort" ""
+ substituteInPlace setup.cfg \
+ --replace "--cov=cssselect2" "" \
+ --replace "--flake8" "" \
+ --replace "--isort" ""
+ '';
+
propagatedBuildInputs = [ tinycss2 ];
- checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ];
-
- LC_ALL = "en_US.UTF-8";
+ checkInputs = [ pytest pytestrunner ];
meta = with lib; {
description = "CSS selectors for Python ElementTree";
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index f227ed99bc9a..0f4c559bd16b 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, django }:
buildPythonPackage rec {
- version = "3.9.1";
+ version = "3.9.2";
pname = "djangorestframework";
src = fetchPypi {
inherit pname version;
- sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66";
+ sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp";
};
# Test settings are missing
diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix
index 90e2c526789f..c200b6959b64 100644
--- a/pkgs/development/python-modules/dlib/default.nix
+++ b/pkgs/development/python-modules/dlib/default.nix
@@ -1,12 +1,17 @@
-{ buildPythonPackage, dlib, python, pytest }:
+{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
+ # although AVX can be enabled, we never test with it. Some Hydra machines
+ # fail because of this, however their build results are probably used on hardware
+ # with AVX support.
checkPhase = ''
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
+ setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ];
+
patches = [ ./build-cores.patch ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix
new file mode 100644
index 000000000000..15c771ebaf52
--- /dev/null
+++ b/pkgs/development/python-modules/dnslib/default.nix
@@ -0,0 +1,20 @@
+{ lib, python, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "dnslib";
+ version = "0.9.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c";
+ };
+
+ checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";
+
+ meta = with lib; {
+ description = "Simple library to encode/decode DNS wire-format packets";
+ license = licenses.bsd2;
+ homepage = https://bitbucket.org/paulc/dnslib/;
+ maintainers = with maintainers; [ delroth ];
+ };
+}
diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
index b532c7d19f73..2856eeeab1b9 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "face_recognition";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
repo = pname;
owner = "ageitgey";
- rev = "v${version}";
- sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv";
+ rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e";
+ sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx";
};
postPatch = ''
@@ -19,6 +19,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ];
+ # Our dlib is compiled with AVX instructions by default which breaks
+ # with "Illegal instruction" on some builders due to missing hardware features.
+ #
+ # As this makes the build fairly unreliable, it's better to skip the test and to ensure that
+ # the build is working and after each change to the package, manual testing should be done.
+ doCheck = false;
+
+ # Although tests are disabled by default, checkPhase still exists, so
+ # maintainers can check the package's functionality locally before modifying it.
checkInputs = [ flake8 pytest glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 5709b17c524a..8099f3318e86 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flake8-import-order";
- version = "0.18";
+ version = "0.18.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf";
+ sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
};
propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 78db8e0e10cd..1557cfdd52d5 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "folium";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n";
+ sha256 = "0f25fhwxnix8hddzf67barzjwwsvpww112zisrvz2lpl08j388rn";
};
checkInputs = [ pytest nbconvert pandas mock ];
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index fe4cf01a8dfe..b207e7ca239e 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "gym";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155";
+ sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 672704249dc9..b422b368ffb6 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -1,6 +1,7 @@
{ buildPythonPackage, fetchPypi, isPy3k
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
-, setuptools_scm }:
+, setuptools_scm, jaraco_collections
+}:
buildPythonPackage rec {
pname = "irc";
@@ -23,5 +24,6 @@ buildPythonPackage rec {
jaraco_stream
pytz
jaraco_itertools
+ jaraco_collections
];
}
diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index 5a7e50d43322..bb9958a6fef1 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -1,22 +1,24 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }:
-buildPythonPackage rec {
+let
+ skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
+ testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
+in buildPythonPackage rec {
pname = "isort";
- version = "4.3.4";
+ version = "4.3.16"; # Note 4.x is the last version that supports Python2
src = fetchPypi {
inherit pname version;
- sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
+ sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08";
};
- propagatedBuildInputs = lib.optional isPy27 futures;
+ propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ];
checkInputs = [ mock pytest ];
+ # isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/
checkPhase = ''
- py.test test_isort.py -k "not test_long_line_comments \
- and not test_import_case_produces_inconsistent_results_issue_472 \
- and not test_no_extra_lines_issue_557"
+ PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index c0b30edb9ad4..8fde41e9b499 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -1,5 +1,6 @@
{ buildPythonPackage, fetchPypi, setuptools_scm
-, six, jaraco_classes }:
+, six, jaraco_classes, jaraco_text
+}:
buildPythonPackage rec {
pname = "jaraco.collections";
@@ -11,7 +12,7 @@ buildPythonPackage rec {
doCheck = false;
buildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ six jaraco_classes ];
+ propagatedBuildInputs = [ six jaraco_classes jaraco_text ];
# break dependency cycle
patchPhase = ''
diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
new file mode 100644
index 000000000000..43530fcc3285
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
@@ -0,0 +1,38 @@
+From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Sun, 10 Mar 2019 13:10:18 +0100
+Subject: [PATCH] Don't run flake8 checks during the build
+
+If the code simply violates their code style, the Nix package shouldn't fail.
+---
+ pytest.ini | 2 +-
+ setup.cfg | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pytest.ini b/pytest.ini
+index d165e5e..d8e4694 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,6 +1,6 @@
+ [pytest]
+ norecursedirs=dist build .tox .eggs
+-addopts=--doctest-modules --flake8
++addopts=--doctest-modules
+ doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
+ filterwarnings=
+ ignore:Possible nested set::pycodestyle:113
+diff --git a/setup.cfg b/setup.cfg
+index 9f3517f..c9033ec 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0
+ testing =
+ pytest >= 3.5, !=3.7.3
+ pytest-checkdocs
+- pytest-flake8
+ docs =
+ sphinx
+ jaraco.packaging >= 3.2
+--
+2.18.1
+
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index 4057d7ad2758..cbf966785e17 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
-, inflect, more-itertools, six, pytest, pytest-flake8 }:
+, inflect, more-itertools, six, pytest
+}:
buildPythonPackage rec {
pname = "jaraco.itertools";
@@ -10,9 +11,11 @@ buildPythonPackage rec {
sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae";
};
+ patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
+
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ inflect more-itertools six ];
- checkInputs = [ pytest pytest-flake8 ];
+ checkInputs = [ pytest ];
checkPhase = ''
pytest
diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
new file mode 100644
index 000000000000..aab9604b9ce8
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
@@ -0,0 +1,38 @@
+From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Sun, 10 Mar 2019 16:42:21 +0100
+Subject: [PATCH] Don't run flake8 checks during the build
+
+If the code simply violates their code style, the Nix package shouldn't fail.
+---
+ pytest.ini | 2 +-
+ setup.cfg | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pytest.ini b/pytest.ini
+index 9b3c1ec..a5189c1 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,6 +1,6 @@
+ [pytest]
+ norecursedirs=dist build .tox .eggs
+-addopts=--doctest-modules --flake8
++addopts=--doctest-modules
+ doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+ filterwarnings=
+ ignore:Possible nested set::pycodestyle:113
+diff --git a/setup.cfg b/setup.cfg
+index 3e7bbed..5cac7a2 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0
+ testing =
+ pytest >= 3.5, !=3.7.3
+ pytest-checkdocs
+- pytest-flake8
+ docs =
+ sphinx
+ jaraco.packaging >= 3.2
+--
+2.18.1
+
diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix
index 68fba6bfb5fb..ae05a76da1d5 100644
--- a/pkgs/development/python-modules/jaraco_logging/default.nix
+++ b/pkgs/development/python-modules/jaraco_logging/default.nix
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
-, tempora, six, pytest, pytest-flake8 }:
+, tempora, six, pytest
+}:
buildPythonPackage rec {
pname = "jaraco.logging";
@@ -10,9 +11,11 @@ buildPythonPackage rec {
sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg";
};
+ patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
+
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora six ];
- checkInputs = [ pytest pytest-flake8 ];
+ checkInputs = [ pytest ];
checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" pytest
diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
index 222a92e60fb6..6087258a289b 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -1,14 +1,15 @@
{ buildPythonPackage, fetchPypi, setuptools_scm
-, jaraco_functools, jaraco_collections }:
+, jaraco_functools
+}:
buildPythonPackage rec {
pname = "jaraco.text";
- version = "2.0";
+ version = "3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa";
+ sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx";
};
doCheck = false;
buildInputs =[ setuptools_scm ];
- propagatedBuildInputs = [ jaraco_functools jaraco_collections ];
+ propagatedBuildInputs = [ jaraco_functools ];
}
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index d96752ba05f3..f9f5ba23eac9 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
+, fetchpatch
, sphinx
, numpydoc
, pytest
@@ -10,16 +11,30 @@
buildPythonPackage rec {
pname = "joblib";
- version = "0.12.4";
+ version = "0.13.2";
- # get full repository inorder to run tests
- src = fetchFromGitHub {
- owner = "joblib";
- repo = pname;
- rev = version;
- sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524";
};
+ # python-lz4 compatibility
+ # https://github.com/joblib/joblib/pull/847
+ patches = [
+ (fetchpatch {
+ url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch;
+ sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h";
+ })
+ (fetchpatch {
+ url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch;
+ sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba";
+ })
+ (fetchpatch {
+ url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch;
+ sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d";
+ })
+ ];
+
checkInputs = [ sphinx numpydoc pytest ];
propagatedBuildInputs = [ python-lz4 ];
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 0478d59c7085..978ed150ef45 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -13,6 +13,7 @@
, tornado
, traitlets
, requests
+, notebook
, pythonOlder
, nodePackages
}:
@@ -106,7 +107,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
- traitlets prometheus_client async_generator
+ traitlets prometheus_client async_generator notebook
];
# Disable tests because they take an excessive amount of time to complete.
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index b70228b6835a..72de84f9c59e 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kombu";
- version = "4.3.0";
+ version = "4.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8";
+ sha256 = "389ba09e03b15b55b1a7371a441c894fd8121d174f5583bbbca032b9ea8c9edd";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 6858a6bcf949..3dedc3b06d88 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "lark-parser";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
- sha256 = "0mf10xm9blqik8mwrpw0r07vqlk2y4r98yqvk1sq849zqlxmqpsr";
+ sha256 = "0kaiw8zzzcp92p6mzm9zkyhv578p0x4lzjsyl8b4rnsafplmbscs";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index ef01fde2daa7..6babc6ae0145 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -66,8 +66,9 @@ buildPythonPackage rec {
enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+
buildInputs = [
- cmake
cython
nose
];
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix
index fb433be8d990..810f37b4b136 100644
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -5,7 +5,8 @@
, enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo
-, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
+# darwin has its own "MacOSX" backend
+, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index e795181e2ff0..d3ea365082cd 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -4,7 +4,8 @@
, enableGhostscript ? true, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo
-, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
+# darwin has its own "MacOSX" backend
+, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
new file mode 100644
index 000000000000..c8595f0383e7
--- /dev/null
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
+, urllib3, python-dateutil , pytz, faker, mock, nose }:
+
+buildPythonPackage rec {
+ pname = "minio";
+ version = "4.0.13";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1sbmv1lskm5cs3jmn8f2688pimgibly16g8ycc6fgnsjanyby35l";
+ };
+
+ disabled = !isPy3k;
+
+ checkInputs = [ faker mock nose ];
+ propagatedBuildInputs = [ urllib3 python-dateutil pytz ];
+
+ meta = with lib; {
+ description = "Simple APIs to access any Amazon S3 compatible object storage server";
+ homepage = https://github.com/minio/minio-py;
+ maintainers = with maintainers; [ peterromfeldhk ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
index 1adfe13dd13b..fa11ab3fb907 100644
--- a/pkgs/development/python-modules/nevow/default.nix
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ twisted ];
+ checkInputs = [ twisted ];
+
checkPhase = ''
trial formless nevow
'';
diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix
index c34b75bd0415..ae4e8a039711 100755
--- a/pkgs/development/python-modules/osmnx/default.nix
+++ b/pkgs/development/python-modules/osmnx/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "osmnx";
- version = "0.8.1";
+ version = "0.9";
src = fetchFromGitHub {
owner = "gboeing";
repo = pname;
rev = "v${version}";
- sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k";
+ sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z";
};
propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 4619400b6e35..37c999e86b4c 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -16,8 +16,13 @@ buildPythonPackage rec {
sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
};
+ nativeBuildInputs = with pkgs; [
+ swig1 coin3d soqt
+ ];
+
buildInputs = with pkgs; with xorg; [
- swig1 coin3d soqt libGLU_combined
+ coin3d soqt
+ libGLU_combined
libXi libXext libSM libICE libX11
];
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 5f43ae32ea23..d8f3c01bbd48 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -5,6 +5,10 @@
, requests
, pytz
, tzlocal
+, i3ipc
+, pydbus
+, pygobject3
+, pyserial
, file
, acpi
@@ -20,14 +24,14 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.16";
-
+
src = fetchPypi {
inherit pname version;
sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g";
};
doCheck = false;
- propagatedBuildInputs = [ pytz requests tzlocal ];
+ propagatedBuildInputs = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial ];
buildInputs = [ file ];
prePatch = ''
sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 899b18eecbed..32c5f38b66d0 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
checkInputs = [ hypothesis pandas pytest ];
PYARROW_BUILD_TYPE = "release";
+ PYARROW_WITH_PARQUET = true;
PYARROW_CMAKE_OPTIONS = [
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
@@ -24,6 +25,10 @@ buildPythonPackage rec {
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
];
+ preBuild = ''
+ export PYARROW_PARALLEL=$NIX_BUILD_CORES
+ '';
+
preCheck = ''
rm pyarrow/tests/test_jvm.py
rm pyarrow/tests/test_hdfs.py
@@ -43,13 +48,15 @@ buildPythonPackage rec {
# when it is not intended to be imported at all
rm pyarrow/tests/deserialize_buffer.py
substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
+
+ # Fails to bind a socket
+ # "PermissionError: [Errno 1] Operation not permitted"
+ substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled"
'';
ARROW_HOME = _arrow-cpp;
PARQUET_HOME = _arrow-cpp;
- setupPyBuildFlags = ["--with-parquet" ];
-
checkPhase = ''
mv pyarrow/tests tests
rm -rf pyarrow
diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix
new file mode 100644
index 000000000000..944278ce3c2c
--- /dev/null
+++ b/pkgs/development/python-modules/pybullet/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, libGLU_combined
+, xorg
+}:
+
+buildPythonPackage rec {
+ pname = "pybullet";
+ version = "2.4.8";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0b6dkrac5zydxqfrf827xhamsimychrn77dsfnz1kf7c1crlwcw9";
+ };
+
+ buildInputs = [
+ libGLU_combined
+ xorg.libX11
+ ];
+
+ patches = [
+ # make sure X11 and OpenGL can be found at runtime
+ ./static-libs.patch
+ ];
+
+ meta = with lib; {
+ description = "Open-source software for robot simulation, integrated with OpenAI Gym";
+ homepage = https://pybullet.org/;
+ license = licenses.zlib;
+ maintainers = with maintainers; [ timokau ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/pkgs/development/python-modules/pybullet/static-libs.patch
new file mode 100644
index 000000000000..08a68b814866
--- /dev/null
+++ b/pkgs/development/python-modules/pybullet/static-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 98efabdbf..e69e79084 100644
+--- a/setup.py
++++ b/setup.py
+@@ -563,6 +563,8 @@ print("-----")
+
+ extensions = []
+
++libraries += [ "X11", "GL" ] # statically link x11 and opengl
++
+ pybullet_ext = Extension("pybullet",
+ sources = sources,
+ libraries = libraries,
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
new file mode 100644
index 000000000000..ac4af42851cd
--- /dev/null
+++ b/pkgs/development/python-modules/pyhocon/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+# Runtime inputs:
+, pyparsing
+# Check inputs:
+, pytest
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "pyhocon";
+ version = "0.3.51";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "10l014br012fa583rnj3wqf6g9gmljamcwpw4snqwwg15i0dmkll";
+ };
+
+ propagatedBuildInputs = [ pyparsing ];
+
+ checkInputs = [ pytest mock ];
+
+ # Tests fail because necessary data files aren't packaged for PyPi yet.
+ # See https://github.com/chimpler/pyhocon/pull/203
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = https://github.com/chimpler/pyhocon/;
+ description = "HOCON parser for Python";
+ # Long description copied from
+ # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py
+ # (the tip of master as of 2019-03-24).
+ longDescription = ''
+ A HOCON parser for Python. It additionally provides a tool
+ (pyhocon) to convert any HOCON content into json, yaml and properties
+ format
+ '';
+ license = licenses.asl20;
+ maintainers = [ maintainers.chreekat ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
index 299fba098d9d..19b26a30ad71 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
py.test -k 'not test_includeme' pyramid_beaker/tests.py
'';
- buildInputs = [ pytest ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ beaker pyramid ];
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index b58e1f48bb80..17d60f7507d3 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -2,12 +2,12 @@
, setuptools }:
buildPythonPackage rec {
- version = "2.0.1";
+ version = "2.1.0";
pname = "pyshp";
src = fetchPypi {
inherit pname version;
- sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as";
+ sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76";
};
buildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index abb0bdebd5da..e23e63525183 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -13,7 +13,11 @@ buildPythonPackage rec {
enableParallelBuilding = true;
- buildInputs = [ cmake pyside qt4 pysideShiboken ];
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qt4 ];
+
+ propagatedBuildInputs = [ pyside pysideShiboken ];
meta = {
description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix
index 852de1fd49cd..f9e6846367c3 100644
--- a/pkgs/development/python-modules/pytest-faulthandler/default.nix
+++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d";
};
- buildInputs = [ setuptools_scm pytest ];
+ nativeBuildInputs = [ setuptools_scm pytest ];
checkInputs = [ pytest-mock ];
propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 6a70b6e8ce97..4fd0570a50dc 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-mock";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4";
+ sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4";
};
propagatedBuildInputs = lib.optional (!isPy3k) mock;
diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix
new file mode 100644
index 000000000000..053b4897e833
--- /dev/null
+++ b/pkgs/development/python-modules/python-markdown-math/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, markdown
+}:
+
+buildPythonPackage rec {
+ pname = "python-markdown-math";
+ version = "0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022";
+ };
+
+ checkInputs = [ markdown ];
+
+ meta = {
+ description = "Math extension for Python-Markdown";
+ homepage = https://github.com/mitya57/python-markdown-math;
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ klntsky ];
+ };
+}
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index 598767e6ca9b..fc4c192968f2 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "quandl";
- version = "3.4.5";
+ version = "3.4.6";
src = fetchPypi {
inherit version;
pname = "Quandl";
- sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys";
+ sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g";
};
doCheck = true;
diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
index eeed42892308..4522c7623283 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -9,14 +9,11 @@
buildPythonPackage rec {
pname = "restructuredtext_lint";
- version = "1.2.2";
-
- # https://github.com/twolfson/restructuredtext-lint/pull/47
- disabled = isPy37;
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350";
+ sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908";
};
checkInputs = [ nose testtools ];
diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix
new file mode 100644
index 000000000000..8aa45966bd20
--- /dev/null
+++ b/pkgs/development/python-modules/roboschool/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, buildPythonPackage
+, python
+, fetchFromGitHub
+, fetchpatch
+, qt5
+, boost
+, assimp
+, gym
+, bullet-roboschool
+, pkgconfig
+, which
+}:
+
+buildPythonPackage rec {
+ pname = "roboschool";
+ version = "1.0.39";
+
+ src = fetchFromGitHub {
+ owner = "openai";
+ repo = "roboschool";
+ rev = version;
+ sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh";
+ };
+
+ propagatedBuildInputs = [
+ gym
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ qt5.qtbase # needs the `moc` tool
+ which
+ ];
+
+ buildInputs = [
+ bullet-roboschool
+ assimp
+ qt5.qtbase
+ boost
+ ];
+
+ NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}";
+
+ patches = [
+ # Remove kwarg that was removed in upstream gym
+ # https://github.com/openai/roboschool/pull/180
+ (fetchpatch {
+ name = "remove-close-kwarg.patch";
+ url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch";
+ sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r";
+ })
+ ];
+
+ preBuild = ''
+ # First build the cpp dependencies
+ cd roboschool/cpp-household
+ make \
+ MOC=moc \
+ -j$NIX_BUILD_CORES
+ cd ../..
+ '';
+
+ # Does a QT sanity check, but QT is not expected to work in isolation
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Open-source software for robot simulation, integrated with OpenAI Gym";
+ homepage = https://github.com/openai/roboschool;
+ license = licenses.mit;
+ maintainers = with maintainers; [ timokau ];
+ };
+}
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index b2c63ea97e3b..c1791db9fbc9 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "shellingham";
- version = "1.2.8";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn";
+ sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 0fde898ca04f..bf57b9846ee5 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "shodan";
- version = "1.10.4";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4";
+ sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 2b0ff6e443a7..b41633da4d39 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "snakeviz";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5fe23667708a4ed04047abfbf209675a8488ea6ea8c038d7de06d8a083fb3531";
+ sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa";
};
# Upstream doesn't run tests from setup.py
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index acbc2a608173..79ae18d33eaa 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -63,7 +63,10 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \
--replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \
- --replace "msgpack-numpy<0.4.4" "msgpack-numpy"
+ --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \
+ --replace "wheel>=0.32.0,<0.33.0" "wheel" \
+ --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \
+ --replace "msgpack>=0.5.6,<0.6.0" "msgpack"
'';
# Cannot find cython modules.
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index 08240d5c594a..c3ee5237935e 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "vine";
- version = "1.2.0";
+ version = "1.3.0";
disable = pythonOlder "2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f";
+ sha256 = "133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87";
};
buildInputs = [ case pytest ];
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index 9496d51bfc1e..19945785eed9 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -4,18 +4,18 @@
buildPythonPackage rec {
pname = "Werkzeug";
- version = "0.14.1";
+ version = "0.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c";
+ sha256 = "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655";
};
propagatedBuildInputs = [ itsdangerous ];
- checkInputs = [ pytest requests glibcLocales hypothesis ];
+ checkInputs = [ pytest requests hypothesis ];
checkPhase = ''
- LC_ALL="en_US.UTF-8" py.test ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}
+ pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 68d097d71d6a..79f0fb13d70d 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
-, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }:
+, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }:
buildPythonPackage rec {
pname = "xdot";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ];
- propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ];
+ propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
meta = with lib; {
description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d72ad7094d16..5d8d7d562259 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -424,7 +424,6 @@ let
showtext = [ pkgs.pkgconfig ];
spate = [ pkgs.pkgconfig ];
stringi = [ pkgs.pkgconfig ];
- sys = [ pkgs.libapparmor ];
sysfonts = [ pkgs.pkgconfig ];
tesseract = [ pkgs.pkgconfig ];
Cairo = [ pkgs.pkgconfig ];
@@ -443,6 +442,11 @@ let
Matrix = [ pkgs.libiconv ];
mgcv = [ pkgs.libiconv ];
igraph = [ pkgs.libiconv ];
+ ape = [ pkgs.libiconv ];
+ expm = [ pkgs.libiconv ];
+ mnormt = [ pkgs.libiconv ];
+ phangorn = [ pkgs.libiconv ];
+ quadprog = [ pkgs.libiconv ];
};
packagesRequireingX = [
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index b0abb2c54fc5..c881d4eb4744 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -63,7 +63,6 @@ let
else if type == "git" then
fetchgit {
inherit (attrs.source) url rev sha256 fetchSubmodules;
- leaveDotGit = true;
}
else if type == "url" then
fetchurl attrs.source
@@ -95,6 +94,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
inherit src;
+
unpackPhase = attrs.unpackPhase or ''
runHook preUnpack
@@ -142,6 +142,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
gempkg=$(echo "$output" | grep -oP 'File: \K(.*)')
echo "gem package built: $gempkg"
+ elif [[ "$type" == "git" ]]; then
+ git init
+ # remove variations to improve the likelihood of a bit-reproducible output
+ rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD .git/refs/remotes/origin/HEAD .git/config
+ # support `git ls-files`
+ git add .
fi
runHook postBuild
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index f5317519d76b..9759bb532c8d 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
stdenv.mkDerivation rec {
- version = "0.95.1";
- name = "flow-${version}";
+ pname = "flow";
+ version = "0.96.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "0sxmk8qg61j6wdylkw53di65152mynv4agji865h23ay66nyi3lw";
+ sha256 = "04al9jnaxgh8la6s2pzzpzm6pyfc5c6g7pc8cwz4xcngbsw60cpn";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 97140d10ca22..c08106eea2ff 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmd-${version}";
- version = "6.11.0";
+ version = "6.12.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
- sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb";
+ sha256 = "1fayb62i6p21q1d6y7ixljf37r7n7vwjwa69q5z6wr4zspaj79f9";
};
installPhase = ''
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
new file mode 100644
index 000000000000..86748b716e6e
--- /dev/null
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "bazelisk";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "philwo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72";
+ };
+
+ modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
+
+ meta = with stdenv.lib; {
+ description = "A user-friendly launcher for Bazel";
+ homepage = https://github.com/philwo/bazelisk;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ elasticdog ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index eb9f0d106d10..1e29e4b34f08 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -13,12 +13,17 @@
}:
let
- srcDeps = lib.singleton (
- fetchurl {
+ srcDeps = [
+ (fetchurl {
url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
- }
- );
+ })
+
+ (fetchurl {
+ url = "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz";
+ sha256 = "1ld8m5cj9j0r474f56pixcfi0xvx3w7pzwahxngs8f6ns0yimz5w";
+ })
+ ];
distDir = runCommand "bazel-deps" {} ''
mkdir -p $out
@@ -61,7 +66,7 @@ let
in
stdenv.mkDerivation rec {
- version = "0.22.0";
+ version = "0.24.0";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -85,9 +90,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
- sha256 = "0hannnvia8rvmi2v5d97j1f6wv0m1kxkd5hq4aqp0dqjr0ka4q38";
+ sha256 = "11gsc00ghxqkbci8nrflkwq1lcvqawlgkaryj458b24si6bjl7b2";
};
+ # Necessary for the tests to pass on Darwin with sandbox enabled.
+ # Bazel starts a local server and needs to bind a local address.
+ __darwinAllowLocalNetworking = true;
+
sourceRoot = ".";
patches = [
@@ -168,6 +177,10 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/env python" "${python}/bin/python" \
--replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
+ # md5sum is part of coreutils
+ sed -i 's|/sbin/md5|md5sum|' \
+ src/BUILD
+
# substituteInPlace is rather slow, so prefilter the files with grep
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
@@ -211,8 +224,17 @@ stdenv.mkDerivation rec {
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
--replace /bin:/usr/bin ${defaultShellPath}
+ # This is necessary to avoid:
+ # "error: no visible @interface for 'NSDictionary' declares the selector
+ # 'initWithContentsOfURL:error:'"
+ # This can be removed when the apple_sdk is upgraded beyond 10.13+
+ sed -i '/initWithContentsOfURL:versionPlistUrl/ {
+ N
+ s/error:nil\];/\];/
+ }' tools/osx/xcode_locator.m
+
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
- echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp
+ echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
@@ -236,18 +258,27 @@ stdenv.mkDerivation rec {
customBash
] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ];
- # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
- # detector (see com.google.devtools.build.lib.skyframe.FileFunction).
- # Change this to $(mktemp -d) as soon as we figure out why.
+ # Bazel makes extensive use of symlinks in the WORKSPACE.
+ # This causes problems with infinite symlinks if the build output is in the same location as the
+ # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
+ # subdirectory.
+ # Failing to do this causes "infinite symlink expansion detected"
+ preBuildPhases = ["preBuildPhase"];
+ preBuildPhase = ''
+ mkdir bazel_src
+ shopt -s dotglob extglob
+ mv !(bazel_src) bazel_src
+ '';
buildPhase = ''
- export TMPDIR=/tmp/.bazel-$UID
- ./compile.sh
- scripts/generate_bash_completion.sh \
- --bazel=./output/bazel \
- --output=output/bazel-complete.bash \
- --prepend=scripts/bazel-complete-header.bash \
- --prepend=scripts/bazel-complete-template.bash
+ # Increasing memory during compilation might be necessary.
+ # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
+ ./bazel_src/compile.sh
+ ./bazel_src/scripts/generate_bash_completion.sh \
+ --bazel=./bazel_src/output/bazel \
+ --output=./bazel_src/output/bazel-complete.bash \
+ --prepend=./bazel_src/scripts/bazel-complete-header.bash \
+ --prepend=./bazel_src/scripts/bazel-complete-template.bash
'';
installPhase = ''
@@ -255,15 +286,15 @@ stdenv.mkDerivation rec {
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
# if it can’t find something in tools, it calls $out/bin/bazel-real
- cp scripts/packages/bazel.sh $out/bin/bazel
- mv output/bazel $out/bin/bazel-real
+ cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
+ mv ./bazel_src/output/bazel $out/bin/bazel-real
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
# shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
- mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
- cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
+ mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
+ cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
'';
doInstallCheck = true;
@@ -278,6 +309,8 @@ stdenv.mkDerivation rec {
examples/java-native/src/test/java/com/example/myproject:hello
}
+ cd ./bazel_src
+
# test whether $WORKSPACE_ROOT/tools/bazel works
mkdir -p tools
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index afe93ddf383e..25ff6d09d420 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,32 +52,32 @@ rec {
};
gradle_latest = gradleGen rec {
- name = "gradle-5.0";
- nativeVersion = "0.14";
+ name = "gradle-5.3.1";
+ nativeVersion = "0.17";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "19krxq9pid9dg6bhdbhhg7ykm5kcx7lv7cr58rj67g0h6jgsqmv1";
+ sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w";
};
};
gradle_4_10 = gradleGen rec {
- name = "gradle-4.10.2";
+ name = "gradle-4.10.3";
nativeVersion = "0.14";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "0a9s2iisivgaapsz4vq1l8fa2w0wnlq0cj67yv5a0rybnahnv75l";
+ sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
};
};
gradle_3_5 = gradleGen rec {
- name = "gradle-3.5";
+ name = "gradle-3.5.1";
nativeVersion = "0.14";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b";
+ sha256 = "1y7fbhrdriclbs5ksxahi0aafsz760lalwyz8r4llysc5pskbkld";
};
};
@@ -91,6 +91,10 @@ rec {
};
};
+ # Nix pkgs that depend on this old version:
+ # pkgs/tools/security/jd-gui/default.nix
+ # pkgs/servers/mxisd/default.nix
+ # If these packages are updated, this old version can probably be removed
gradle_2_5 = gradleGen rec {
name = "gradle-2.5";
nativeVersion = "0.10";
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 2d0bf244370f..ce15de8678d6 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -8,7 +8,7 @@ in {
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
};
scons_latest = mkScons {
- version = "3.0.4";
- sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72";
+ version = "3.0.5";
+ sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz";
};
}
diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix
index 895d6e4bec62..a127fb137f67 100644
--- a/pkgs/development/tools/cachix/default.nix
+++ b/pkgs/development/tools/cachix/default.nix
@@ -1,3 +1,3 @@
{ haskellPackages, haskell }:
-haskell.lib.justStaticExecutables haskellPackages.cachix
+(haskell.lib.doDistribute haskellPackages.cachix).bin
diff --git a/pkgs/development/tools/cadre/Gemfile b/pkgs/development/tools/cadre/Gemfile
new file mode 100644
index 000000000000..aa42f75c95cf
--- /dev/null
+++ b/pkgs/development/tools/cadre/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'cadre', '=1.0.4'
diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock
new file mode 100644
index 000000000000..c14df9cffa61
--- /dev/null
+++ b/pkgs/development/tools/cadre/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ cadre (1.0.4)
+ thor (>= 0.14, < 1.0)
+ tilt (> 1.0)
+ valise (~> 1.2)
+ thor (0.20.3)
+ tilt (2.0.9)
+ valise (1.2.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ cadre (= 1.0.4)
+
+BUNDLED WITH
+ 1.16.3
diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/development/tools/cadre/default.nix
new file mode 100644
index 000000000000..93eb32cfb514
--- /dev/null
+++ b/pkgs/development/tools/cadre/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp }:
+
+bundlerApp {
+ pname = "cadre";
+ gemdir = ./.;
+ exes = [ "cadre" ];
+
+ meta = with lib; {
+ description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs";
+ homepage = https://github.com/nyarly/cadre;
+ license = licenses.mit;
+ maintainers = [ maintainers.nyarly ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/development/tools/cadre/gemset.nix
new file mode 100644
index 000000000000..33fd428debf2
--- /dev/null
+++ b/pkgs/development/tools/cadre/gemset.nix
@@ -0,0 +1,35 @@
+{
+ cadre = {
+ dependencies = ["thor" "tilt" "valise"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07q60s1bm2xar46g00ls5fjkn6dm2kfxhsz9ayblc31x5kr8d83a";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ thor = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ type = "gem";
+ };
+ version = "0.20.3";
+ };
+ tilt = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+ type = "gem";
+ };
+ version = "2.0.9";
+ };
+ valise = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index f44e76c0b8e5..aa262fd54952 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "11.8.0";
+ version = "11.9.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s";
+ sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1";
+ sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp";
+ sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index ed650f37698a..14d07a0108fa 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "easyjson-unstable-${version}";
- version = "2018-08-23";
+ version = "2019-02-21";
goPackagePath = "github.com/mailru/easyjson";
goDeps = ./deps.nix;
src = fetchFromGitHub {
owner = "mailru";
repo = "easyjson";
- rev = "60711f1a8329503b04e1c88535f419d0bb440bff";
- sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
+ rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003";
+ sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix
index 3ba1d12a8048..0429d8876b29 100644
--- a/pkgs/development/tools/easyjson/deps.nix
+++ b/pkgs/development/tools/easyjson/deps.nix
@@ -1,3 +1,3 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
]
diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix
index 23620a12530b..597e66f9b293 100644
--- a/pkgs/development/tools/electron/3.x.nix
+++ b/pkgs/development/tools/electron/3.x.nix
@@ -1,7 +1,7 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:
let
- version = "3.1.4";
+ version = "3.1.8";
name = "electron-${version}";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@@ -19,19 +19,19 @@ let
src = {
i686-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
- sha256 = "1llwpd10cz5nfwqimib7xkc3xxj3z4y19l97wxma3bciizmmgq3k";
+ sha256 = "1vq4vanlwixgk1q4v5d24f1ywgy2af1r14f9byzfy89vwds77yk9";
};
x86_64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
- sha256 = "0mb7q82r9ndvz181lnkplmvwkijzc2msrpfwpghrhsc4j3zbh0bf";
+ sha256 = "13zds8bzn4z11544llkh99fw75gddxs5b9h1m5xgjzw37vf6rpws";
};
armv7l-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
- sha256 = "0cf4jqq3n66dm11cy96q3nj1jxajv49yamhvn5g8a85nq4s5cx6f";
+ sha256 = "0rfw1ydlmixyhifpmm2qyxapx3iqav4nlnzp2km9z7a0hpc4lii6";
};
aarch64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
- sha256 = "0lxp7fpccwk6qdw79dgjlm9hywfwl3aj932qg2aff18vs077skrg";
+ sha256 = "0qrnvzjz78fblfg4r6xpzc40p10y6865gqpwx2h5vsdfp6sgq898";
};
}.${stdenv.hostPlatform.system} or throwSystem;
@@ -59,7 +59,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
- sha256 = "1indim895a58ds09z91c8jfqmdp7ba85rx6bhq6dabgnvkykwmz0";
+ sha256 = "0ms75306dq2ym838zk9d9nypnd8yjipl0zqyq9bvd4r32p241hw9";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 8c6dce0114e8..31867a87b77f 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }:
let
- version = "4.0.6";
+ version = "4.1.3";
name = "electron-${version}";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@@ -16,23 +16,22 @@ let
linux = {
inherit name version meta;
-
src = {
i686-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
- sha256 = "1ffv4wlj827wyq7y2hfaz2d0fapqr2r9likb90ayzh91vmkc8c2y";
+ sha256 = "0fjrzyd872frvlihjr5xssjqirrp0c0aa1s1z8kr5y6hw6d13m2y";
};
x86_64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
- sha256 = "01b063jabx7fglh63dk7nh21xxadwxrrvavcwznpw6jhid48g2yz";
+ sha256 = "1qzfz8nm3p6qsx843jl4nlbnx6l0pa6fzz61bb8w2c1p88dwqddy";
};
armv7l-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
- sha256 = "18dsb3pyj9gfn8xyzhblx7nidgp39pfqs1ml07nxfkf1bjdh4c4w";
+ sha256 = "0x5zw0937gm89rfh094kpabzcddw61ckijm8k0k5spir1nb2za9v";
};
aarch64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
- sha256 = "0dx6bzj0laygqkyl8ngbh0yfzyc5mxr3fxlqb867cza9sz5hh95l";
+ sha256 = "1fz9przvm4jf97xbg3m7ipcnf2gv1zxhmby3bqps582nhc17fckd";
};
}.${stdenv.hostPlatform.system} or throwSystem;
@@ -60,7 +59,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
- sha256 = "0r1yn5lz808xdwp29g4kmlm5v0i1fsdxd4ph537gyz3sfn30dgq9";
+ sha256 = "0s2fiys8mglmz5qf9l1k19p7ipl0r6vd2222n0j8m83bcr1779rz";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index b0069d3488e0..85e7c07b8cce 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -2,8 +2,8 @@
buildGoPackage rec {
name = "gocode-gomod-unstable-${version}";
- version = "2018-10-16";
- rev = "12640289f65065d652cc942ffa01a52bece1dd53";
+ version = "2019-02-12";
+ rev = "8cc90faaf4765d16de060350da41eadccc1a15d1";
goPackagePath = "github.com/stamblerre/gocode";
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "stamblerre";
repo = "gocode";
- sha256 = "1avv0b5p2l8pv38m5gg97k57ndr5k9yy0rfkmmwjq96pa221hs1q";
+ sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94";
};
goDeps = ./deps.nix;
@@ -45,6 +45,6 @@ buildGoPackage rec {
homepage = https://github.com/stamblerre/gocode;
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ kalbasit ];
+ maintainers = with maintainers; [ kalbasit rvolosatovs ];
};
}
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index cf3b0414c7a3..b8071bf1ac26 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -1,16 +1,16 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "k6-${version}";
- version = "0.23.1";
+buildGoPackage rec {
+ pname = "k6";
+ version = "0.24.0";
goPackagePath = "github.com/loadimpact/k6";
src = fetchFromGitHub {
owner = "loadimpact";
- repo = "k6";
+ repo = pname;
rev = "v${version}";
- sha256 = "03krrpbb67h9hmrg5m94936kha667yh2lqzp9s7fv0b6khskr9r7";
+ sha256 = "1riyyi4lxdaqilzzkxzzw3hzcrjjcylq2jh3p3656f99wiisvj28";
};
subPackages = [ "./" ];
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 4ce2972e56da..bfad2a3d46a8 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ktlint-${version}";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchurl {
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
- sha256 = "0l3h3q4qc7ij3sr9ij1mrhir18xic7qbzgb621fv16zgdk6rjghn";
+ sha256 = "0bqpflvnh423w54162r0d6l503lql1bwqykxw18s2fx1n1gb3n9a";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 231a2009491f..d142078c50fa 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "lazygit-${version}";
- version = "0.5";
+ version = "0.7.2";
goPackagePath = "github.com/jesseduffield/lazygit";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "jesseduffield";
repo = "lazygit";
rev = "v${version}";
- sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1";
+ sha256 = "1b5mzmxw715cx7b0n22hvrpk0dbavzypljc7skwmh8k1nlx935jj";
};
postPatch = ''
diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
index 8b5bea7ac6ce..27f0063e24be 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/pkgs/development/tools/mdk/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib }:
stdenv.mkDerivation {
- name = "gnu-mdk-1.2.9";
+ name = "gnu-mdk-1.2.10";
src = fetchurl {
- url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz;
- sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc";
+ url = https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz;
+ sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib ];
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index b2dbf65bcb08..ed4886305e3c 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext, emacs }:
stdenv.mkDerivation rec {
- name = "cflow-1.5";
+ name = "cflow-1.6";
src = fetchurl {
url = "mirror://gnu/cflow/${name}.tar.bz2";
- sha256 = "0yq33k5ap1zpnja64n89iai4zh018ffr72wki5a6mzczd880mr3g";
+ sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l";
};
patchPhase = ''
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 5b17cc00c31d..1cfd9caa626b 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -110,6 +110,11 @@ in releaseTools.nixBuild rec {
url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch";
sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8";
})
+ ] ++ [
+ (fetchpatch {
+ url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
+ sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
+ })
];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index 9784308b010e..c4164b414331 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -2,11 +2,11 @@
python2.pkgs.buildPythonApplication rec {
pname = "lit";
- version = "0.7.1";
+ version = "0.8.0";
src = python2.pkgs.fetchPypi {
inherit pname version;
- sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f";
+ sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c";
};
# Non-standard test suite. Needs custom checkPhase.
diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
index 5a9642057d8a..43d86966694f 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pkgconf-1.6.0";
+ pname = "pkgconf";
+ version = "1.6.1";
src = fetchurl {
- url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz";
- sha256 = "1rgcw7lbmxv45y4ybnlh1wzhd1d15d2616499ajjnrvnnnms6db1";
+ url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1310va0nm8iyb4ghgz9qlx7qb00iha1523hq1zbgj0c98cwfxf92";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix
new file mode 100644
index 000000000000..879346a2b796
--- /dev/null
+++ b/pkgs/development/tools/misc/semver-tool/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "semver-tool";
+ version = "2.1.0";
+
+ src = fetchFromGitHub {
+ owner = "fsaintjacques";
+ repo = pname;
+ rev = version;
+ sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr";
+ };
+
+ dontBuild = true; # otherwise we try to 'make' which fails.
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ install src/semver $out/bin
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = https://github.com/fsaintjacques/semver-tool;
+ description = "semver bash implementation";
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.qyliss ];
+ };
+}
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 66d9d521b058..65a210ed4b91 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "tokei-${version}";
- version = "9.0.0";
+ pname = "tokei";
+ version = "9.1.1";
src = fetchFromGitHub {
- owner = "Aaronepower";
- repo = "tokei";
+ owner = "XAMPPRocky";
+ repo = pname;
rev = "v${version}";
- sha256 = "04d32w3yc98f6swxap19d6vrv8vi3w843cgnmf28mxcy4nbnls1n";
+ sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp";
};
- cargoSha256 = "0vjb4j8qwlmvw55i2jif1a7hwv928h90dzwlpcqb0h6nlv812fav";
+ cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4";
meta = with stdenv.lib; {
description = "Program that displays statistics about your code";
- homepage = https://github.com/Aaronepower/tokei;
+ homepage = https://github.com/XAMPPRocky/tokei;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index be7a488e96e8..80aeb17bef31 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocamlPackages, opaline }:
+{ stdenv, fetchurl, ocaml, findlib, opaline }:
stdenv.mkDerivation rec {
name = "dune-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a";
};
- buildInputs = with ocamlPackages; [ ocaml findlib ];
+ buildInputs = [ ocaml findlib ];
buildFlags = "release";
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit;
- inherit (ocamlPackages.ocaml.meta) platforms;
+ inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
index 10088cce4912..fa5393c1871c 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocamlPackages }:
stdenv.mkDerivation rec {
- version = "0.3.1";
+ version = "0.3.2";
name = "opaline-${version}";
src = fetchFromGitHub {
owner = "jaapb";
repo = "opaline";
rev = "v${version}";
- sha256 = "0vd5xaf272hk4iqfj347jvbppy7my5p5gz8yqpkvl1d1i6lzh08v";
+ sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m";
};
buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild opam-file-format ];
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index b3e9e71ebc05..a7f06e734530 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
- --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store
+ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
index 537997eb8a45..59a1cd223b5d 100755
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -114,7 +114,7 @@ print <<'EOF';
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
- --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store
+ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install
'';
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index e283c162092a..9292d124545a 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "quicktemplate-unstable-${version}";
- version = "2018-11-26";
+ version = "2019-01-31";
goPackagePath = "github.com/valyala/quicktemplate";
goDeps = ./deps.nix;
src = fetchFromGitHub {
owner = "valyala";
repo = "quicktemplate";
- rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
- sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
+ rev = "d08324ac14fa81325830fae7eb30188ec68427f8";
+ sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index b1f8af2491c5..3d08a6b787d8 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
buildGoPackage rec {
name = "skaffold-${version}";
- version = "0.25.0";
+ version = "0.26.0";
# rev is the 0.25.0 commit, mainly for skaffold version command output
- rev = "0f4b8fe88969e9fa38346934ea6af7c46772d603";
+ rev = "d88680e9ede62da65500702670ef72fc9272a06f";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "0adcim029w64494sb3cw14xhv2vf33l8vhwm2wz8mnmr402nbvkx";
+ sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5";
};
meta = {
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 5100b3624c42..c9df2703daa5 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -1,38 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
-
+{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }:
let
-
-spirv_sources = {
- # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`.
- tools = fetchFromGitHub {
- owner = "KhronosGroup";
- repo = "SPIRV-Tools";
- rev = "9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661";
- sha256 = "1spfii4zib1lmz40vnz1d1cr6is7q2n7rvar1vfzi33gwrn8rqhi";
- };
- headers = fetchFromGitHub {
- owner = "KhronosGroup";
- repo = "SPIRV-Headers";
- rev = "d5b2e1255f706ce1f88812217e9a554f299848af";
- sha256 = "18530mpa030ckjhn78z9vbfd35l5jgh3mg22ra6k8gw8zx4wjhsl";
- };
-};
-
+ # Update spirv-headers rev in lockstep according to DEPs file
+ version = "2019.1";
in
+assert version == spirv-headers.version;
stdenv.mkDerivation rec {
name = "spirv-tools-${version}";
- version = "2018-09-20";
+ inherit version;
- src = spirv_sources.tools;
- patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Tools";
+ rev = "v${version}";
+ sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r";
+ };
enableParallelBuilding = true;
buildInputs = [ cmake python ];
- passthru = {
- headers = spirv_sources.headers;
- };
+ cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index ad23ed7e9dc4..21068a8b05f6 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "stagit-${version}";
- version = "0.6";
+ version = "0.9.1";
src = fetchgit {
url = git://git.codemadness.org/stagit;
rev = version;
- sha256 = "1xwjdqkf5akxa66ak7chd9gna89kgbdzjrpx4ch7f770ycp2s5sr";
+ sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9";
};
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix
new file mode 100644
index 000000000000..0ad7d7f78d4a
--- /dev/null
+++ b/pkgs/development/tools/statik/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "statik-unstable-${version}";
+ version = "2018-11-28";
+ goPackagePath = "github.com/rakyll/statik";
+ goDeps = ./deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "rakyll";
+ repo = "statik";
+ rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e";
+ sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5";
+ };
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/rakyll/statik";
+ description = "Embed files into a Go executable ";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ chiiruno ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/statik/deps.nix b/pkgs/development/tools/statik/deps.nix
new file mode 100644
index 000000000000..0429d8876b29
--- /dev/null
+++ b/pkgs/development/tools/statik/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+]
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index c76c670739e1..702b7a564b22 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, writeText, python3
+{ stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3
, vulkan-headers, vulkan-loader, glslang
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
-
stdenv.mkDerivation rec {
name = "vulkan-validation-layers-${version}";
- version = "1.1.85.0";
+ version = "1.1.101.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
- sha256 = "1y5ny587h62139fxnz760hsyv1dmw29m1a9vq096sn8qafh3jzbz";
+ sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js
deleted file mode 100755
index 3eadea559032..000000000000
--- a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const crypto = require('crypto');
-const fs = require("fs");
-const https = require("https");
-const path = require("path");
-const util = require("util");
-
-const lockfile = require("@yarnpkg/lockfile")
-const docopt = require("docopt").docopt;
-
-////////////////////////////////////////////////////////////////////////////////
-
-const USAGE = `
-Usage: yarn2nix [options]
-
-Options:
- -h --help Shows this help.
- --no-nix Hide the nix output
- --no-patch Don't patch the lockfile if hashes are missing
- --lockfile=FILE Specify path to the lockfile [default: ./yarn.lock].
-`
-
-const HEAD = `
-{fetchurl, linkFarm}: rec {
- offline_cache = linkFarm "offline" packages;
- packages = [
-`.trim();
-
-////////////////////////////////////////////////////////////////////////////////
-
-function generateNix(lockedDependencies) {
- let found = {};
-
- console.log(HEAD)
-
- for (var depRange in lockedDependencies) {
- let dep = lockedDependencies[depRange];
-
- let depRangeParts = depRange.split('@');
- let [url, sha1] = dep["resolved"].split("#");
- let file_name = path.basename(url)
-
- if (found.hasOwnProperty(file_name)) {
- continue;
- } else {
- found[file_name] = null;
- }
-
-
- console.log(`
- {
- name = "${file_name}";
- path = fetchurl {
- name = "${file_name}";
- url = "${url}";
- sha1 = "${sha1}";
- };
- }`)
- }
-
- console.log(" ];")
- console.log("}")
-}
-
-
-function getSha1(url) {
- return new Promise((resolve, reject) => {
- https.get(url, (res) => {
- const { statusCode } = res;
- const hash = crypto.createHash('sha1');
- if (statusCode !== 200) {
- const err = new Error('Request Failed.\n' +
- `Status Code: ${statusCode}`);
- // consume response data to free up memory
- res.resume();
- reject(err);
- }
-
- res.on('data', (chunk) => { hash.update(chunk); });
- res.on('end', () => { resolve(hash.digest('hex')) });
- res.on('error', reject);
- });
- });
-};
-
-function updateResolvedSha1(pkg) {
- // local dependency
- if (!pkg.resolved) { return Promise.resolve(); }
- let [url, sha1] = pkg.resolved.split("#", 2)
- if (!sha1) {
- return new Promise((resolve, reject) => {
- getSha1(url).then(sha1 => {
- pkg.resolved = `${url}#${sha1}`;
- resolve();
- }).catch(reject);
- });
- } else {
- // nothing to do
- return Promise.resolve();
- };
-}
-
-function values(obj) {
- var entries = [];
- for (let key in obj) {
- entries.push(obj[key]);
- }
- return entries;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Main
-////////////////////////////////////////////////////////////////////////////////
-
-var options = docopt(USAGE);
-
-let data = fs.readFileSync(options['--lockfile'], 'utf8')
-let json = lockfile.parse(data)
-if (json.type != "success") {
- throw new Error("yarn.lock parse error")
-}
-
-// Check fore missing hashes in the yarn.lock and patch if necessary
-var pkgs = values(json.object);
-Promise.all(pkgs.map(updateResolvedSha1)).then(() => {
- let newData = lockfile.stringify(json.object);
-
- if (newData != data) {
- console.error("found changes in the lockfile", options["--lockfile"]);
-
- if (options["--no-patch"]) {
- console.error("...aborting");
- process.exit(1);
- }
-
- fs.writeFileSync(options['--lockfile'], newData);
- }
-
- if (!options['--no-nix']) {
- generateNix(json.object);
- }
-})
diff --git a/pkgs/development/tools/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix/default.nix
deleted file mode 100644
index e86c0aac2c99..000000000000
--- a/pkgs/development/tools/yarn2nix/default.nix
+++ /dev/null
@@ -1,199 +0,0 @@
-{ stdenv, lib, fetchurl, linkFarm, runCommand, nodejs, yarn }:
-
-let
- unlessNull = item: alt:
- if item == null then alt else item;
-
- yarn2nix = mkYarnPackage {
- src = ./.;
- yarnNix = ./yarn.nix;
-
- passthru = {
- inherit
- defaultYarnFlags
- linkNodeModulesHook
- mkYarnModules
- mkYarnNix
- mkYarnPackage
- # Export yarn again to make it easier to find out which yarn was used.
- yarn
- ;
- };
-
- meta = with lib; {
- description = "generate nix expressions from a yarn.lock file";
- homepage = "https://github.com/moretea/yarn2nix";
- license = licenses.gpl3;
- maintainers = with maintainers; [ manveru zimbatm ];
- };
- };
-
- # Generates the yarn.nix from the yarn.lock file
- mkYarnNix = yarnLock:
- runCommand "yarn.nix" {}
- "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out";
-
- # Loads the generated offline cache. This will be used by yarn as
- # the package source.
- importOfflineCache = yarnNix:
- let
- pkg = import yarnNix { inherit fetchurl linkFarm; };
- in
- pkg.offline_cache;
-
- defaultYarnFlags = [
- "--offline"
- "--frozen-lockfile"
- "--ignore-engines"
- "--ignore-scripts"
- ];
-
- mkYarnModules = {
- name,
- packageJSON,
- yarnLock,
- yarnNix ? mkYarnNix yarnLock,
- yarnFlags ? defaultYarnFlags,
- pkgConfig ? {},
- preBuild ? "",
- }:
- let
- offlineCache = importOfflineCache yarnNix;
- extraBuildInputs = (lib.flatten (builtins.map (key:
- pkgConfig.${key} . buildInputs or []
- ) (builtins.attrNames pkgConfig)));
- postInstall = (builtins.map (key:
- if (pkgConfig.${key} ? postInstall) then
- ''
- for f in $(find -L -path '*/node_modules/${key}' -type d); do
- (cd "$f" && (${pkgConfig.${key}.postInstall}))
- done
- ''
- else
- ""
- ) (builtins.attrNames pkgConfig));
- in
- stdenv.mkDerivation {
- inherit name preBuild;
- phases = ["configurePhase" "buildPhase"];
- buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
- configurePhase = ''
- # Yarn writes cache directories etc to $HOME.
- export HOME=$PWD/yarn_home
- '';
-
- buildPhase = ''
- runHook preBuild
-
- cp ${packageJSON} ./package.json
- cp ${yarnLock} ./yarn.lock
- chmod +w ./yarn.lock
-
- yarn config --offline set yarn-offline-mirror ${offlineCache}
-
- # Do not look up in the registry, but in the offline cache.
- # TODO: Ask upstream to fix this mess.
- sed -i -E 's|^(\s*resolved\s*")https?://.*/|\1|' yarn.lock
- yarn install ${lib.escapeShellArgs yarnFlags}
-
- ${lib.concatStringsSep "\n" postInstall}
-
- mkdir $out
- mv node_modules $out/
- patchShebangs $out
- '';
- };
-
- # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
- # the shell-hook environment.
- linkNodeModulesHook = ''
- if [[ -d node_modules || -L node_modules ]]; then
- echo "./node_modules is present. Replacing."
- rm -rf node_modules
- fi
-
- ln -s "$node_modules" node_modules
- '';
-
- mkYarnPackage = {
- name ? null,
- src,
- packageJSON ? src + "/package.json",
- yarnLock ? src + "/yarn.lock",
- yarnNix ? mkYarnNix yarnLock,
- yarnFlags ? defaultYarnFlags,
- yarnPreBuild ? "",
- pkgConfig ? {},
- extraBuildInputs ? [],
- publishBinsFor ? null,
- ...
- }@attrs:
- let
- package = lib.importJSON packageJSON;
- pname = package.name;
- version = package.version;
- deps = mkYarnModules {
- name = "${pname}-modules-${version}";
- preBuild = yarnPreBuild;
- inherit packageJSON yarnLock yarnNix yarnFlags pkgConfig;
- };
- publishBinsFor_ = unlessNull publishBinsFor [pname];
- in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig"] // {
- inherit src;
-
- name = unlessNull name "${pname}-${version}";
-
- buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
-
- node_modules = deps + "/node_modules";
-
- configurePhase = attrs.configurePhase or ''
- runHook preConfigure
-
- if [ -d npm-packages-offline-cache ]; then
- echo "npm-pacakges-offline-cache dir present. Removing."
- rm -rf npm-packages-offline-cache
- fi
-
- if [[ -d node_modules || -L node_modules ]]; then
- echo "./node_modules is present. Removing."
- rm -rf node_modules
- fi
-
- mkdir -p node_modules
- ln -s $node_modules/* node_modules/
- ln -s $node_modules/.bin node_modules/
-
- if [ -d node_modules/${pname} ]; then
- echo "Error! There is already an ${pname} package in the top level node_modules dir!"
- exit 1
- fi
-
- runHook postConfigure
- '';
-
- # Replace this phase on frontend packages where only the generated
- # files are an interesting output.
- installPhase = attrs.installPhase or ''
- runHook preInstall
-
- mkdir -p $out
- cp -r node_modules $out/node_modules
- cp -r . $out/node_modules/${pname}
- rm -rf $out/node_modules/${pname}/node_modules
-
- mkdir $out/bin
- node ${./fixup_bin.js} $out ${lib.concatStringsSep " " publishBinsFor_}
-
- runHook postInstall
- '';
-
- passthru = {
- inherit package deps;
- } // (attrs.passthru or {});
-
- # TODO: populate meta automatically
- });
-in
- yarn2nix
diff --git a/pkgs/development/tools/yarn2nix/fixup_bin.js b/pkgs/development/tools/yarn2nix/fixup_bin.js
deleted file mode 100644
index dab1759c2046..000000000000
--- a/pkgs/development/tools/yarn2nix/fixup_bin.js
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-/* Usage:
- * node fixup_bin.js [, ... ]
- */
-
-const fs = require("fs");
-const path = require("path");
-
-const output = process.argv[2];
-const packages_to_publish_bin = process.argv.slice(3);
-const derivation_bin_path = output + "/bin";
-
-function processPackage(name) {
- console.log("Processing ", name);
- const package_path = output + "/node_modules/" + name;
- const package_json_path = package_path + "/package.json";
- const package_json = JSON.parse(fs.readFileSync(package_json_path));
-
- if (!package_json.bin) {
- console.log("No binaries provided");
- return;
- }
-
- // There are two alternative syntaxes for `bin`
- // a) just a plain string, in which case the name of the package is the name of the binary.
- // b) an object, where key is the name of the eventual binary, and the value the path to that binary.
- if (typeof package_json.bin == "string") {
- let bin_name = package_json.bin;
- package_json.bin = { };
- package_json.bin[package_json.name] = bin_name;
- }
-
- for (let binName in package_json.bin) {
- const bin_path = package_json.bin[binName];
- const full_bin_path = path.normalize(package_path + "/" + bin_path);
- fs.symlinkSync(full_bin_path, derivation_bin_path + "/"+ binName);
- console.log("Linked", binName);
- }
-}
-
-packages_to_publish_bin.forEach((pkg) => {
- processPackage(pkg);
-});
diff --git a/pkgs/development/tools/yarn2nix/package.json b/pkgs/development/tools/yarn2nix/package.json
deleted file mode 100644
index 130eee67c560..000000000000
--- a/pkgs/development/tools/yarn2nix/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "yarn2nix",
- "version": "1.0.0",
- "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies",
- "main": "index.js",
- "repository": ".",
- "author": "Maarten Hoogendoorn ",
- "license": "MIT",
- "scripts": {
- "yarn2nix": "bin/yarn2nix.js"
- },
- "bin": {
- "yarn2nix": "bin/yarn2nix.js"
- },
- "dependencies": {
- "@yarnpkg/lockfile": "^1.0.0",
- "docopt": "^0.6.2"
- }
-}
diff --git a/pkgs/development/tools/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix/yarn.lock
deleted file mode 100644
index 976d2c530e1e..000000000000
--- a/pkgs/development/tools/yarn2nix/yarn.lock
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@yarnpkg/lockfile@^1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz#33d1dbb659a23b81f87f048762b35a446172add3"
-
-docopt@^0.6.2:
- version "0.6.2"
- resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"
\ No newline at end of file
diff --git a/pkgs/development/tools/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix/yarn.nix
deleted file mode 100644
index a9e42e7d986c..000000000000
--- a/pkgs/development/tools/yarn2nix/yarn.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{fetchurl, linkFarm}: rec {
- offline_cache = linkFarm "offline" packages;
- packages = [
-
- {
- name = "lockfile-1.0.0.tgz";
- path = fetchurl {
- name = "lockfile-1.0.0.tgz";
- url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz";
- sha1 = "33d1dbb659a23b81f87f048762b35a446172add3";
- };
- }
-
- {
- name = "docopt-0.6.2.tgz";
- path = fetchurl {
- name = "docopt-0.6.2.tgz";
- url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz";
- sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11";
- };
- }
- ];
-}
diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock
index c953a311077e..560213897c91 100644
--- a/pkgs/development/web/mailcatcher/Gemfile.lock
+++ b/pkgs/development/web/mailcatcher/Gemfile.lock
@@ -1,11 +1,11 @@
GEM
remote: https://rubygems.org/
specs:
- daemons (1.2.4)
+ daemons (1.3.1)
eventmachine (1.0.9.1)
- mail (2.6.6)
- mime-types (>= 1.16, < 4)
- mailcatcher (0.6.5)
+ mail (2.7.1)
+ mini_mime (>= 0.1.1)
+ mailcatcher (0.7.1)
eventmachine (= 1.0.9.1)
mail (~> 2.3)
rack (~> 1.5)
@@ -13,11 +13,9 @@ GEM
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
- mime-types (3.1)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0521)
+ mini_mime (1.0.1)
rack (1.6.11)
- rack-protection (1.5.3)
+ rack-protection (1.5.5)
rack
sinatra (1.4.8)
rack (~> 1.5)
@@ -26,12 +24,12 @@ GEM
skinny (0.2.4)
eventmachine (~> 1.0.0)
thin (>= 1.5, < 1.7)
- sqlite3 (1.3.13)
+ sqlite3 (1.4.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- tilt (2.0.7)
+ tilt (2.0.9)
PLATFORMS
ruby
@@ -40,4 +38,4 @@ DEPENDENCIES
mailcatcher
BUNDLED WITH
- 1.16.4
+ 1.17.2
diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix
index 75e1336b1c3c..7603e8ff2ef1 100644
--- a/pkgs/development/web/mailcatcher/gemset.nix
+++ b/pkgs/development/web/mailcatcher/gemset.nix
@@ -1,13 +1,17 @@
{
daemons = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bmb4qrd95b5gl3ym5j3q6mf090209f4vkczggn49n56w6s6zldz";
+ sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
type = "gem";
};
- version = "1.2.4";
+ version = "1.3.1";
};
eventmachine = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z";
@@ -16,41 +20,40 @@
version = "1.0.9.1";
};
mail = {
- dependencies = ["mime-types"];
+ dependencies = ["mini_mime"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
+ sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
type = "gem";
};
- version = "2.6.6";
+ version = "2.7.1";
};
mailcatcher = {
dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx";
+ sha256 = "02w1ycyfv7x0sh9799lz7xa65p5qvl5z4pa8a7prb68h2zwkfq0n";
type = "gem";
};
- version = "0.6.5";
+ version = "0.7.1";
};
- mime-types = {
- dependencies = ["mime-types-data"];
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+ sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
type = "gem";
};
- version = "3.1";
- };
- mime-types-data = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
- type = "gem";
- };
- version = "3.2016.0521";
+ version = "1.0.1";
};
rack = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
@@ -60,15 +63,19 @@
};
rack-protection = {
dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+ sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
type = "gem";
};
- version = "1.5.3";
+ version = "1.5.5";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -78,6 +85,8 @@
};
skinny = {
dependencies = ["eventmachine" "thin"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9";
@@ -86,15 +95,19 @@
version = "0.2.4";
};
sqlite3 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
+ sha256 = "0pmgpqx2sg8pms54rk7kjjy8jwsw21g1f7mb02fggbdcqy8jk3fx";
type = "gem";
};
- version = "1.3.13";
+ version = "1.4.0";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga";
@@ -103,11 +116,13 @@
version = "1.5.1";
};
tilt = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
type = "gem";
};
- version = "2.0.7";
+ version = "2.0.9";
};
}
\ No newline at end of file
diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix
index 3858061eaee3..5f2931e9b27d 100644
--- a/pkgs/development/web/nodejs/v11.nix
+++ b/pkgs/development/web/nodejs/v11.nix
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "11.11.0";
- sha256 = "1732jv95xza8813wk7qy22jxh2x9lnc9lr0rqkql7ggf03wymn56";
+ version = "11.13.0";
+ sha256 = "12n3bm21q8nm6wn116c0af8fpmxhaa7xd4srrba36q0zl4nra4bl";
}
diff --git a/pkgs/games/assaultcube/assaultcube-next.patch b/pkgs/games/assaultcube/assaultcube-next.patch
deleted file mode 100644
index 92fc79966707..000000000000
--- a/pkgs/games/assaultcube/assaultcube-next.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1.1.0.4/source/src/Makefile
-+++ 1.1.0.4/source/src/Makefile
-@@ -6,7 +6,7 @@
- # found to have been caused by the g++ compiler in the past. This seems to have
- # been fixed now by relaxing the optimization that g++ does, so although we'll
- # continue using clang++ (just in case), you can use g++ if you prefer.
--CXX=clang++
-+#CXX=clang++
-
- # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube.
- ACDEBUG=no
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 71e885a04d34..593622c3008b 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg,
- libvorbis, SDL, SDL_image, makeWrapper, zlib,
+ libvorbis, SDL, SDL_image, makeWrapper, zlib, file,
client ? true, server ? true }:
with stdenv.lib;
@@ -8,38 +8,21 @@ stdenv.mkDerivation rec {
# master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix.
pname = "assaultcube";
- version = "unstable-2017-05-01";
-
- meta = {
- description = "Fast and fun first-person-shooter based on the Cube fps";
- homepage = https://assault.cubers.net;
- maintainers = [ maintainers.genesis ];
- platforms = platforms.linux; # should work on darwin with a little effort.
- license = stdenv.lib.licenses.zlib;
- };
+ version = "unstable-2018-05-20";
src = fetchFromGitHub {
owner = "assaultcube";
repo = "AC";
- rev = "9f537b0876a39d7686e773040469fbb1417de18b";
- sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl";
+ rev = "f58ea22b46b5013a520520670434b3c235212371";
+ sha256 = "1vfn3d55vmmipdykrcfvgk6dddi9y95vlclsliirm7jdp20f15hd";
};
- # ${branch} not accepted as a value ?
- # TODO: write a functional BUNDLED_ENET option and restore it in deps.
- patches = [ ./assaultcube-next.patch ];
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
- nativeBuildInputs = [ pkgconfig ];
-
- # add optional for server only ?
- buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ];
-
- #makeFlags = [ "CXX=g++" ];
+ buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ];
targets = (optionalString server "server") + (optionalString client " client");
- buildPhase = ''
- make -C source/src ${targets}
- '';
+ makeFlags = [ "-C source/src" "CXX=c++" "${targets}" ];
desktop = makeDesktopItem {
name = "AssaultCube";
@@ -61,21 +44,29 @@ stdenv.mkDerivation rec {
cp -r config packages $out/$gamedatadir
- # install custom script
- substituteAll ${./launcher.sh} $bindir/assaultcube
- chmod +x $bindir/assaultcube
-
if (test -e source/src/ac_client) then
cp source/src/ac_client $bindir
mkdir -p $out/share/applications
cp ${desktop}/share/applications/* $out/share/applications
install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
+
+ makeWrapper $out/bin/ac_client $out/bin/${pname} \
+ --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
fi
if (test -e source/src/ac_server) then
cp source/src/ac_server $bindir
- ln -s $bindir/${pname} $bindir/${pname}-server
+ makeWrapper $out/bin/ac_server $out/bin/${pname}-server \
+ --run "cd $out/$gamedatadir" --add-flags "-Cconfig/servercmdline.txt"
fi
'';
+
+ meta = {
+ description = "Fast and fun first-person-shooter based on the Cube fps";
+ homepage = https://assault.cubers.net;
+ maintainers = [ maintainers.genesis ];
+ platforms = platforms.linux; # should work on darwin with a little effort.
+ license = stdenv.lib.licenses.zlib;
+ };
}
diff --git a/pkgs/games/assaultcube/launcher.sh b/pkgs/games/assaultcube/launcher.sh
deleted file mode 100644
index 331cb861f66c..000000000000
--- a/pkgs/games/assaultcube/launcher.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!@shell@
-# original scripts are very awful
-
-CUBE_DIR=@out@@gamedatadir@
-
-case $(basename "$0") in
- assaultcube-server)
- CUBE_OPTIONS="-Cconfig/servercmdline.txt"
- BINARYPATH=@out@/bin/ac_server
- ;;
- assaultcube)
- CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init"
- BINARYPATH=@out@/bin/ac_client
- ;;
- *) echo "$0" is not supported.
- exit 1
-esac
-
-cd $CUBE_DIR
-exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@"
diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index 730c7f764cc2..8b549d93fb22 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -1,10 +1,10 @@
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }:
stdenv.mkDerivation rec {
- name = "crispy-doom-5.4";
+ name = "crispy-doom-5.5.1";
src = fetchurl {
url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz";
- sha256 = "0kks7vzp6cwmfv2s39z09vl9w897i8xijg1s8lfbg17viq8azb3x";
+ sha256 = "0qnqyyjnclmwls34m7nk8lpvpaffdmhxshlarsiggcsn9py96kns";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
new file mode 100644
index 000000000000..fc73f89f66c0
--- /dev/null
+++ b/pkgs/games/gscrabble/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub
+, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection
+, python3Packages, gnome3, hicolor-icon-theme }:
+
+buildPythonApplication rec {
+ pname = "gscrabble";
+ version = "unstable-2019-03-11";
+
+ src = fetchFromGitHub {
+ owner = "RaaH";
+ repo = "gscrabble";
+ rev = "4b6e4e151a4cd4a4f66a5be2c8616becac3f2a29";
+ sha256 = "0a89kqh04x52q7qyv1rfa7xif0pdw3zc0dw5a24msala919g90q2";
+ };
+
+ doCheck = false;
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ buildInputs = with gst_all_1; [
+ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
+ hicolor-icon-theme gnome3.adwaita-icon-theme gtk3 gobject-introspection
+ ];
+
+ propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PYTHONPATH : "$out/share/GScrabble/modules"
+ )
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Golden Scrabble crossword puzzle game";
+ homepage = https://github.com/RaaH/gscrabble/;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.genesis ];
+ };
+}
diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix
new file mode 100644
index 000000000000..cad98650c24e
--- /dev/null
+++ b/pkgs/games/lugaru/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg,
+ libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+
+ pname = "lugaru";
+ version = "1.2";
+
+ src = fetchFromGitLab {
+ owner = "osslugaru";
+ repo = "lugaru";
+ rev = version;
+ sha256 = "089rblf8xw3c6dq96vnfla6zl8gxcpcbc1bj5jysfpq63hhdpypz";
+ };
+
+ nativeBuildInputs = [ makeWrapper cmake pkgconfig ];
+
+ buildInputs = [ libGLU openal SDL2 libogg libvorbis libpng libjpeg_turbo ];
+
+ cmakeFlags = [ "-DSYSTEM_INSTALL=ON" ];
+
+ meta = {
+ description = "Lugaru HD: Third person ninja rabbit fighting game";
+ homepage = https://osslugaru.gitlab.io;
+ maintainers = [ maintainers.genesis ];
+ platforms = platforms.linux;
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 217697e1b104..cf20651aa3ea 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -72,9 +72,9 @@ let
};
v5 = {
- version = "5.0.0";
- sha256 = "1b8n8nzlvmld1hl3zgs1xg4jbc1nsf1m2bn7fi794vdr06s6n911";
- dataSha256 = "186i1pna2f3fwa2001y8mw5131h0sndhfdxzfqq2gnr1m83sjm0w";
+ version = "5.0.1";
+ sha256 = "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay";
+ dataSha256 = "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7";
};
in {
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 47527a13b7b7..c57fe642dc3d 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -11,14 +11,14 @@ let
};
});
in stdenv.mkDerivation rec {
- version = "0.44.0";
+ version = "0.45.0";
name = "openmw-${version}";
src = fetchFromGitHub {
owner = "OpenMW";
repo = "openmw";
rev = name;
- sha256 = "0rxkw0bzag7qffifg28dyyga47aaaf5ziiccpv7p8yax1wglvymh";
+ sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4";
};
enableParallelBuilding = true;
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e41caa3db978..926e360a1b4c 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
let
name = "openrct2-${version}";
- version = "0.2.1";
+ version = "0.2.2";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
- sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq";
+ sha256 = "1bfqmb6cbmsjcvj77vppy5lw1m4lkvxd1w3f218ah4788xnkysq2";
};
objects-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
- rev = "v1.0.6";
- sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm";
+ rev = "v1.0.9";
+ sha256 = "1kng0mz8dsdbfd3g6qsk69ap2nq75aizw76j4a6lkfygnbcv8m3j";
};
title-sequences-src = fetchFromGitHub {
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 237021e98010..d0e880f5f2cc 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -6,8 +6,8 @@
let
opengfx = fetchzip {
- url = "http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip";
- sha256 = "1sjzwl8wfdj0izlx2qdq15bqiy1vzq7gq7drydfwwryk173ig5sa";
+ url = "http://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip";
+ sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8";
};
opensfx = fetchzip {
@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
name = "openttd-${version}";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
- url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
- sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2";
+ url = "http://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz";
+ sha256 = "06blx844q6a248jwzqlgi82692vvkmvb00bfdx4jhcwp9mayvza5";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index c147bfb77ad7..3865d8fbef9e 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
name = "stunt-rally-${version}";
- version = "2.6";
+ version = "2.6.1";
src = fetchurl {
url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz";
- sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc";
+ sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v";
};
tracks = fetchurl {
url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz";
- sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb";
+ sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs";
};
# include/OGRE/OgreException.h:265:126: error: invalid conversion from
@@ -22,14 +22,10 @@ stdenv.mkDerivation rec {
preConfigure = ''
pushd data
tar xf ${tracks}
- mv tracks-2.6 tracks
+ mv tracks-${version} tracks
popd
'';
- patches = [
- ./gcc6.patch
- ];
-
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis
makeWrapper enet libXcursor bullet openal
diff --git a/pkgs/games/stuntrally/gcc6.patch b/pkgs/games/stuntrally/gcc6.patch
deleted file mode 100644
index 6632ea4e8856..000000000000
--- a/pkgs/games/stuntrally/gcc6.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp
-index 834eac7..47ec647 100644
---- i/source/ogre/CarModel_Create.cpp
-+++ w/source/ogre/CarModel_Create.cpp
-@@ -130,7 +130,8 @@ void CarModel::Load(int startId)
-
- /// load config .car
- string pathCar;
-- pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient); // force orig for newtorked games
-+ string empty;
-+ pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient)); // force orig for newtorked games
- LoadConfig(pathCar);
-
-
-diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp
-index 76ed8e9..9444271 100644
---- i/source/ogre/Gui_Tweak.cpp
-+++ w/source/ogre/Gui_Tweak.cpp
-@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar,
- pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/",
- pathUser = pathUserD + file;
-
-- if (pathSave) *pathSave = pathUser;
-- if (pathSaveDir) *pathSaveDir = pathUserD;
-+ if (pathSave != "") *pathSave = pathUser;
-+ if (pathSaveDir != "") *pathSaveDir = pathUserD;
-
- if (!forceOrig && PATHMANAGER::FileExists(pathUser))
- {
-diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp
-index dd6dd48..083fa0c 100644
---- i/source/vdrift/cartire.cpp
-+++ w/source/vdrift/cartire.cpp
-@@ -3,6 +3,7 @@
- #include "cardefs.h"
- //#include "../ogre/common/Def_Str.h"
-
-+using namespace std;
-
- void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations)
- {
-diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp
-index 338d122..e67c1db 100644
---- i/source/vdrift/model_obj.cpp
-+++ w/source/vdrift/model_obj.cpp
-@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu
- std::ofstream f(strFileName.c_str());
- if (!f)
- {
-- error_output << "Error opening file for writing: " << error_output << endl;
-+ error_output << "Error opening file for writing: " << endl;
- return false;
- }
-
-diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h
-index b21846a..c115fd6 100644
---- i/source/vdrift/texture.h
-+++ w/source/vdrift/texture.h
-@@ -125,7 +125,7 @@ class TEXTURELIBRARY
- bool FileExists(const std::string & filename)
- {
- std::ifstream f(filename.c_str());
-- return f;
-+ return bool(f);
- }
-
- public:
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix
index 20efe6342859..e36e41885008 100644
--- a/pkgs/misc/acpilight/default.nix
+++ b/pkgs/misc/acpilight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python36, udev, coreutils }:
+{ stdenv, fetchgit, python3, udev, coreutils }:
stdenv.mkDerivation rec {
pname = "acpilight";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd";
};
- pyenv = python36.withPackages (pythonPackages: with pythonPackages; [
+ pyenv = python3.withPackages (pythonPackages: with pythonPackages; [
ConfigArgParse
]);
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 34761df5ea14..d063ec912b97 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
- sha256 = "08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y";
+ sha256 = "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 789cb6fc4de0..ea9554288091 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -77,6 +77,7 @@ pythonPackages.buildPythonApplication {
sip
] ++ stdenv.lib.optionals withQt5 [
pyqt5
+ enum-compat
];
makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ];
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index 287df4db01be..3cb0f787ce76 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, SDL, cmake }:
stdenv.mkDerivation rec {
- name = "hatari-2.1.0";
+ name = "hatari-2.2.1";
src = fetchurl {
- url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2";
- sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb";
+ url = "https://download.tuxfamily.org/hatari/2.2.1/${name}.tar.bz2";
+ sha256 = "0q3g23vnx58w666723v76ilh9j353md3sn48cmlq9gkll8qfzbqi";
};
# For pthread_cancel
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index a3177b07f08b..32201c48ee98 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libdsk-${version}";
- version = "1.5.9";
+ version = "1.5.10";
src = fetchurl {
url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
- sha256 = "1r0y07qd3zixi53vql5yqakvv77qm86s6qjwypk9ckggrp5r3w60";
+ sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g";
};
meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 59f0252259cc..66e17fd3a7a3 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -15,12 +15,12 @@
stdenv.mkDerivation rec {
name = "visualboyadvance-m-${version}";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "visualboyadvance-m";
repo = "visualboyadvance-m";
rev = "v${version}";
- sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz";
+ sha256 = "03cs7wn01flx925sxhpz1j5sxa6s7wfxq71955kasn7a3xr1kxwn";
};
buildInputs = [
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 10481c217851..a12d7d7d5acd 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
-, libiconv, ijs, lcms2
+, libiconv, ijs, lcms2, fetchpatch
, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little
}:
@@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
patches = [
./urw-font-files.patch
./doc-no-ref.diff
+ (fetchpatch {
+ name = "CVE-2019-6116";
+ url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61";
+ sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx";
+ })
];
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
new file mode 100644
index 000000000000..55cd6e1dac04
--- /dev/null
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig,
+ gtk-engine-murrine, gtk3
+}:
+
+stdenv.mkDerivation rec {
+ name = "solarc-gtk-theme-${version}";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "schemar";
+ repo = "solarc-theme";
+ rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643";
+ sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ];
+
+ propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ];
+
+ buildPhase = ''
+ ./autogen.sh --prefix=$out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Solarized version of the Arc theme";
+ homepage = https://github.com/schemar/solarc-theme;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.bricewge ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index fdc207b933c0..1f20bf2d0ead 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-03-13";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "80ef7ea2d0b22f0d8de7387a3d5bf6e9e5b72e9d";
- sha256 = "1i767mxfgwn804hwr088n9n9xmj49bwrvb8nv8qjxynqzp3hxsfb";
+ rev = "89273b65b8de9d3d428e7b1f5c0c347938f5a863";
+ sha256 = "1qgkipiizvzw0jp3f6qp1qkdyvb64hhkimndp0i3gcgfkikbp64p";
};
};
@@ -127,12 +127,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2019-02-16";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "88d883cc89b2d13b3bae60aa294cef57067e17e2";
- sha256 = "0f6xa50r9fv9qhw8slfqq0g0p8y2zc08bpg09f2g0lp69gidi7rg";
+ rev = "dec452fcf71c8d09c4029fe28d9ac12af935f6ac";
+ sha256 = "1gsh0dibbwz7vypvc23h230x56n7i8a5y6c872lqflf2as62x0xr";
};
};
@@ -381,34 +381,34 @@ let
denite-extra = buildVimPluginFrom2Nix {
pname = "denite-extra";
- version = "2018-09-20";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "chemzqm";
repo = "denite-extra";
- rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f";
- sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz";
+ rev = "af18257544027ce89269dba70c12aba1f5b9e23c";
+ sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a";
};
};
denite-git = buildVimPluginFrom2Nix {
pname = "denite-git";
- version = "2018-07-19";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "chemzqm";
repo = "denite-git";
- rev = "edd2c202e05c3f84e31b94a841fef236b923d559";
- sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd";
+ rev = "c86a6b2b22ac16544a8bccbefb608604f9252349";
+ sha256 = "19rx46xd9hi7z1n9adxa9yf4ljv38jhwinplsszwlpcq518ac4i6";
};
};
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-03-17";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "885ca6711b25d77ef69f9704c847d940ceae41c9";
- sha256 = "0f5s51axdpwl5f041rxdl53h5ldysf80kqkx79hkx9f6022b80z5";
+ rev = "8dbf62b3e894ec7749dcedeb10942ac737182089";
+ sha256 = "18ri0jjnzd21icsivrarlxkr48hzplwbaz3840yjqxg83y1alxzh";
};
};
@@ -494,12 +494,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2019-03-17";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "a6ed6a909a238b1583b84496c60075f474421973";
- sha256 = "0s7qg4kzvj1sdc9b9adnxk4x0svnaxa6n7b2slajbbkxpj3bc1pi";
+ rev = "06e8981d5a24a17dcebfb51d69eb2e94a69924db";
+ sha256 = "1mnskw3a5axannm7mnwzvvsz9n2b3a1cmhkahp649x99r6h6992d";
};
};
@@ -527,12 +527,12 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
- version = "2019-03-15";
+ version = "2019-03-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
- rev = "fbbf01311cec8aa8741564b361341c722379e9a8";
- sha256 = "1p0zx4r6v25qbq1avl2gyc4s3nsi9vkrp6vrq8kb3q2y1sx6r3p3";
+ rev = "0b2e6e1c40691b6ebc4ac3f9efe0e9e73debb1cc";
+ sha256 = "0kfdyvcbqd3vwrhsl5bc2b38hw5cqh5sl3srq97y4v93hi5rf72q";
};
};
@@ -584,23 +584,23 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2019-03-04";
+ version = "2019-03-25";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "440ee9e14fc854cf5aeb0971e4ab8b9f5204fcb0";
- sha256 = "0dyw4d103h9cwxr2z19c6mj5sxprb47p865vknrf4yny9sdrqrcd";
+ rev = "5526c8e9345f3c3953757bb13511e4bb49878456";
+ sha256 = "18drq44lnh4d0pq6b30jiinlkylaq68llc0gyxvgpy6gy0k77gyk";
};
};
fastfold = buildVimPluginFrom2Nix {
pname = "fastfold";
- version = "2019-01-13";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "konfekt";
repo = "fastfold";
- rev = "6de79db47e6990c075ea0d05442a5cd4b6a650f2";
- sha256 = "1blsy9xfklviflnh2psn9xgnh1v9x4nnibfibmzsa0parpyczsfb";
+ rev = "69d455dcf1ee40bf050a0d1e94f49f02bb2f4832";
+ sha256 = "1hk9ir47c7rds3fya9vd2rsvc2mfj602fhqvz1h0acvxkqy34lsk";
};
};
@@ -838,23 +838,23 @@ let
iosvkem = buildVimPluginFrom2Nix {
pname = "iosvkem";
- version = "2018-08-26";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "neutaaaaan";
repo = "iosvkem";
- rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1";
- sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm";
+ rev = "e552c65165b42df79d462d9222ae022116bdb26a";
+ sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5";
};
};
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2019-02-24";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "1f7e661d9d29fa1485e781eaa97a4491f952e316";
- sha256 = "1x96bjw25kmwgi86h0ama4xl6qrbyk7yia5fiw9qkicy1j7yk7j1";
+ rev = "f26b2a8802ad47406a0ab1e7b68234fa22d88891";
+ sha256 = "01bbs70j5z00rn4bmf05zvl3mavyv8w6faj59z0mldvxnfidw2bb";
fetchSubmodules = true;
};
};
@@ -1081,12 +1081,12 @@ let
neocomplete-vim = buildVimPluginFrom2Nix {
pname = "neocomplete-vim";
- version = "2018-11-19";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neocomplete.vim";
- rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40";
- sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq";
+ rev = "5f3e213c629b7fe1aa3723bf56fe3ead5555a526";
+ sha256 = "1x5hnh7riv50c7ywnn2mch0rgks5r2y4k32y8bb616ld0xndaa4b";
};
};
@@ -1103,12 +1103,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2019-03-13";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "f9c53c383596b2c12d0bba87ab92bb67042eca33";
- sha256 = "1avgffzc5dxs783kr0nvb2fr6vc8vy4ypqlk74vlfq534gkky68a";
+ rev = "8db90526af3655e32f803e18176150f593cd08a6";
+ sha256 = "0vv81hxc2f53299xvb8m0px6f0kpmmr4h5h6h5wzqyg7xixfjg0i";
};
};
@@ -1125,23 +1125,23 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
- version = "2019-03-16";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "benekastah";
repo = "neomake";
- rev = "716a6a44a7d6d80cb2e5f90220d31bf25b960e68";
- sha256 = "0n6ppv3m7yrahsd5khyvshrh69swfv5s5anjk6n1vab26kmd1c2y";
+ rev = "36c91c3b8f0f731b3ab6a3a01a9eb2e1be15ab86";
+ sha256 = "0fkkssy38hcp23mgbwgkcnmhlnxj7iqn2iq39k8g7fbhhmnbixik";
};
};
neomru-vim = buildVimPluginFrom2Nix {
pname = "neomru-vim";
- version = "2019-03-02";
+ version = "2019-03-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neomru.vim";
- rev = "8ad581e0925ecefb94a7d2251803e9b3ba78818e";
- sha256 = "0nwvx6416z1vhp7wyh862ifzid1fmj6ld5nyj4inn7b9njg9v8p5";
+ rev = "d3d47938fb3f3205bbb9eb8796a5da33f1d7c2cc";
+ sha256 = "0cvj2y6i55x04rcv8cpvgy7grgc0rq7z2sxjxn6xxi0ligqpvjp7";
};
};
@@ -1191,12 +1191,12 @@ let
neoyank-vim = buildVimPluginFrom2Nix {
pname = "neoyank-vim";
- version = "2018-12-03";
+ version = "2019-03-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neoyank.vim";
- rev = "9ff9d9df82a7671c3ffd7735953d6cf269bac213";
- sha256 = "1jaiw86gvb6dnzwnzq7hp04cc3b9yibzw0z868izpnc1696hkb3d";
+ rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629";
+ sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn";
};
};
@@ -1213,12 +1213,12 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2019-03-07";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
- rev = "288669db1fa888947deaf715d7469233f476909f";
- sha256 = "0k5420f8y311c717ifamyhqhqzlca2y9sy7qw3z2np9z7ms5dask";
+ rev = "7513f256aa1d59b6a749cefe5ac505375b1b8a6a";
+ sha256 = "0163bvsmnnw598x2nyi9lzdk6akzj62cbsldp8prhl6d7x3gdmaf";
};
};
@@ -1323,12 +1323,12 @@ let
papercolor-theme = buildVimPluginFrom2Nix {
pname = "papercolor-theme";
- version = "2019-02-27";
+ version = "2019-03-17";
src = fetchFromGitHub {
owner = "NLKNguyen";
repo = "papercolor-theme";
- rev = "c4a4dfdc21c14f58c12d077242ae33b729c894b2";
- sha256 = "01136926mr8z0b78srzvx6wkm8ipf3hv2vb8cj5sj8zgq6xs7kwg";
+ rev = "6f34e06ac4b3e1ac7c5755a0216791066fbe74c8";
+ sha256 = "13kdglkxdwxpmv0xwcwgzivb8x74bfypw2xn8w237niryvxg4y7z";
};
};
@@ -1466,12 +1466,12 @@ let
Recover-vim = buildVimPluginFrom2Nix {
pname = "Recover-vim";
- version = "2019-02-02";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "Recover.vim";
- rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34";
- sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8";
+ rev = "abc1073aac08279523c35546e4a2c85cbd8d656d";
+ sha256 = "11y6ha65j35cb73x6wdcwqs7k12lcdd38ygirsmhk4216mnl2p7f";
};
};
@@ -1532,12 +1532,12 @@ let
rust-vim = buildVimPluginFrom2Nix {
pname = "rust-vim";
- version = "2019-02-18";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
- rev = "fdb2d39fb04b139fcdb9b707f9b2ccc219566632";
- sha256 = "0vamhy95gkjybikcf5cifdd66scjf4wmjh2nw67f65n4narw1lps";
+ rev = "2234f0d3f8204b44f30ff6eb3b6f7345c23aef92";
+ sha256 = "1s0v14na6vlzazw95ssfcqkpylnqxaj7kh1qyni97ixiqqw7vrjw";
};
};
@@ -1719,12 +1719,12 @@ let
targets-vim = buildVimPluginFrom2Nix {
pname = "targets-vim";
- version = "2019-01-08";
+ version = "2019-03-18";
src = fetchFromGitHub {
owner = "wellle";
repo = "targets.vim";
- rev = "d6466f6f281f920e178637882a2e6e4f40c3acc2";
- sha256 = "04fzg94y37hm917klzz2k0j26wacnf0848nwa8br9b9vx5a6ixnv";
+ rev = "5915a1a3cef7c60dbea2ff50153417e5f6371952";
+ sha256 = "1013d1rkdg6ddnsf0j033q0a14aq65jbv2wrkj1d6i5jr4zjh3f0";
};
};
@@ -1774,12 +1774,12 @@ let
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2019-02-18";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "2bfc63174002903e350de418006eea83efcc8901";
- sha256 = "0k88j7k4jnjql98v55r70kw1igg2s2jaw5lvf9adi3pprsypszf8";
+ rev = "03c24a851181b206ac48beabeee6c2c08d257327";
+ sha256 = "1bbk1ni18rdhpb5w6xhiwdpyyfhc80cljbxvbkpblykg39l0crhx";
};
};
@@ -1840,34 +1840,34 @@ let
unite-vim = buildVimPluginFrom2Nix {
pname = "unite-vim";
- version = "2019-02-02";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "Shougo";
repo = "unite.vim";
- rev = "b55994a18b19499f8de19cf7ea48670113a45e4f";
- sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1";
+ rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f";
+ sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx";
};
};
verilog_systemverilog-vim = buildVimPluginFrom2Nix {
pname = "verilog_systemverilog-vim";
- version = "2019-03-06";
+ version = "2019-03-20";
src = fetchFromGitHub {
owner = "vhda";
repo = "verilog_systemverilog.vim";
- rev = "bbb0826fc2641f2b0fc3beb2ce5fc506515a4ffb";
- sha256 = "1ribz8g5jfvq160957p8b98ihb1sh42w1k670s65i6i45vgkws9r";
+ rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e";
+ sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll";
};
};
vim = buildVimPluginFrom2Nix {
pname = "vim";
- version = "2019-03-16";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "f46e029b4a1cb16c014d8ddbf88e9d361fd2fcf0";
- sha256 = "1sh72zjjg12s6jx1vinj7j3mnx03mb4s44mpa4y62r78j48pfc0p";
+ rev = "25a22bb3338bbe7fec142b9582b2f811f1742f76";
+ sha256 = "0ri5z9z2bi5n519c039brqysyykpfmrmjylkq43qsrxiq18fsia8";
};
};
@@ -2093,23 +2093,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2019-03-16";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "b84e5485221096dc8c2bbc18f130e52265b367cc";
- sha256 = "0cflxpqiqs4dy0jplbciwy3v7ybxj1wmfijic0z6gvbcj6h0hxsv";
+ rev = "86e73cade71651263715f21e58eed87cfed4518e";
+ sha256 = "0xlvnzsnfkzg9qz5n87gvm75xlhgihf3y300zxvsyhk6ihnajyzp";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2018-11-15";
+ version = "2019-03-21";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9";
- sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8";
+ rev = "78cc30cb90b50fab024098bf2a55a4441665ff03";
+ sha256 = "15mddh41vb44p1ppcsk3kb50fhqrlkdv4bmr2r7crny53cjfslh9";
};
};
@@ -2137,12 +2137,12 @@ let
vim-auto-save = buildVimPluginFrom2Nix {
pname = "vim-auto-save";
- version = "2019-02-26";
+ version = "2019-03-19";
src = fetchFromGitHub {
owner = "907th";
repo = "vim-auto-save";
- rev = "d0ef603f037e8abf24ae1d959566722427a1bf92";
- sha256 = "12nqnvdhqv6wsksnd7hd3llw8vyxn0r8v98r0w1hsp7hw8mn1cgf";
+ rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda";
+ sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2";
};
};
@@ -2214,12 +2214,12 @@ let
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
- version = "2018-12-29";
+ version = "2019-03-27";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
- rev = "54d1eacb2e96f6862894bff53a48846b6470e870";
- sha256 = "1j88my182dwlvwrnfpkdgda4qgam28l7hdmmfgjh6h745ax0mghg";
+ rev = "b4aafd5b0f7e5c2b44ba6d92a18196331ac1003a";
+ sha256 = "0plr53xaavwwxvzk1rb724i1cpknh6z09zvbg2y0bgl5cj51b665";
};
};
@@ -2346,23 +2346,23 @@ let
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
- version = "2018-12-04";
+ version = "2019-03-27";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
- rev = "d33796c460229b2cf0dd09fedf1b272da9d13a42";
- sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd";
+ rev = "6fb15d43078b55f30cce5cb73571e6a8f1634124";
+ sha256 = "198c61vz5j27n07r1dx94cr0fzc9pfnz28zl86b3v02y2ry39q27";
};
};
vim-dispatch = buildVimPluginFrom2Nix {
pname = "vim-dispatch";
- version = "2019-02-28";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dispatch";
- rev = "929e0d0aa1139d483c070e4ee2a05f4a3425b0af";
- sha256 = "05js06pvrvjxpwhdp68hmzxskfacmkj2i15khav75f93rsih75dw";
+ rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5";
+ sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k";
};
};
@@ -2401,12 +2401,12 @@ let
vim-easymotion = buildVimPluginFrom2Nix {
pname = "vim-easymotion";
- version = "2018-06-04";
+ version = "2019-03-23";
src = fetchFromGitHub {
owner = "easymotion";
repo = "vim-easymotion";
- rev = "1a0244c90c3ff46219cf9597bb13662be4232407";
- sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy";
+ rev = "85e90c9759e14633d878ed534ef313876ab96555";
+ sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq";
};
};
@@ -2434,12 +2434,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2019-03-13";
+ version = "2019-03-18";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
- rev = "d58efec5cef84c0a6eaeb0fea39e273ad438bd39";
- sha256 = "0djvnxirjjd9shyr76xy2saqbiw9albavddsc1vnsxw5hzlamfc9";
+ rev = "d51d5f7eb5c46992ac718ac648e02e38322e073e";
+ sha256 = "1n95zybvncfz5w4h77li22dcskb3xpf0jlfrw9g5ix80w1n41aar";
};
};
@@ -2588,34 +2588,34 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-03-17";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "d769e0909d8a256f6e1031c98abaab71dc4eedce";
- sha256 = "0n6wl472rd2v6qiddpxs9bcg1fgpv1c5y3aax1njyvb1wic1yx35";
+ rev = "17d4c087f0ad1dec22df17048f05629b75dee600";
+ sha256 = "0kmqix5asajkadlk8r7aczs0cg8nfqkapscaqqg9kcsf5a4ng47y";
};
};
vim-grammarous = buildVimPluginFrom2Nix {
pname = "vim-grammarous";
- version = "2018-09-13";
+ version = "2019-03-30";
src = fetchFromGitHub {
owner = "rhysd";
repo = "vim-grammarous";
- rev = "65e01dd1f19a4cbaade139754d6e8c8cdf45c33a";
- sha256 = "14sjvspnfj5jxghh1vndaxfglr0ypnn59nzrhxnymf6q3g930vcl";
+ rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70";
+ sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz";
};
};
vim-grepper = buildVimPluginFrom2Nix {
pname = "vim-grepper";
- version = "2019-03-15";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-grepper";
- rev = "e638f75a211885e4b48abe1809db18b108208ce0";
- sha256 = "150ijh9qpvvas9njb0nva58s91g06nbd2zxv9glvbirk75j9d3bc";
+ rev = "9e3c7eb2013c83e45ced71383b59941fc871e786";
+ sha256 = "0agc6wlphjr0vmd8a7x9ws1clarrmh8iba8drgs5zdifqhg5q7vl";
};
};
@@ -2819,12 +2819,12 @@ let
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
- version = "2019-02-25";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
- rev = "8450f06ec2c22bf33934728953b722a3847bbc18";
- sha256 = "0k6zxqd20n003baczgvqfvscblh4qg9lymc0w91pyz7lk336050h";
+ rev = "24c896e13d9241024bdb79f48e811748654d7ba2";
+ sha256 = "1c89n4rzjdq12h6wjz04np14hnd33i7fyrxlxv3yyl3hdcvs8bk1";
};
};
@@ -2886,12 +2886,12 @@ let
vim-lastplace = buildVimPluginFrom2Nix {
pname = "vim-lastplace";
- version = "2019-01-18";
+ version = "2019-03-20";
src = fetchFromGitHub {
owner = "farmergreg";
repo = "vim-lastplace";
- rev = "c05db65464e26aef281d4c1e0006d0504f2f76d7";
- sha256 = "0kq44q1ays0wwlfb3yqrfji3bfxpvbsrpzpp9dcf84836p0fpr1j";
+ rev = "fbb88789b531e1fc1abe25b2f44f4f4c8a73f14d";
+ sha256 = "0661dnm0idaqy28pw03fznq5hpl2pbb4r0c1gvdmf59ywhsa2dav";
};
};
@@ -2941,12 +2941,12 @@ let
vim-localvimrc = buildVimPluginFrom2Nix {
pname = "vim-localvimrc";
- version = "2018-11-06";
+ version = "2019-03-24";
src = fetchFromGitHub {
owner = "embear";
repo = "vim-localvimrc";
- rev = "e84959d05472ce2000883b1f73ea34302894bdb9";
- sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw";
+ rev = "08f1389285902473a8b2de045c2d916fcc5affbc";
+ sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1";
};
};
@@ -2963,12 +2963,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2019-03-16";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "16f4f994a0414766ee1f1da069eed5230e409b53";
- sha256 = "1wkv09g5i4wgv01q9lvr5bnmpd5ai0xng0yah06faqn56cnhbawi";
+ rev = "b02690e167a1b49373245aabbedecd29aa470309";
+ sha256 = "0gaqcjdq7rykp4hbac7ibfd3lr19vy9pnzwkn2cmnv18b5sjpbm1";
};
};
@@ -2985,12 +2985,12 @@ let
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2019-02-28";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "plasticboy";
repo = "vim-markdown";
- rev = "691d961a643064ee1feddba8371ff12e44678f5a";
- sha256 = "0yhqszqjfbgyyqkw5ayl2732kdw71dq6s3yg3szcilz2h6z21m7c";
+ rev = "a15334cac67237835e62c9dd1470f6162769779f";
+ sha256 = "1bdi69ni1mgc9x67k8l886bch70jhi4hi5ram1habml4vklr82np";
};
};
@@ -3018,12 +3018,12 @@ let
vim-multiple-cursors = buildVimPluginFrom2Nix {
pname = "vim-multiple-cursors";
- version = "2019-02-21";
+ version = "2019-03-25";
src = fetchFromGitHub {
owner = "terryma";
repo = "vim-multiple-cursors";
- rev = "9d40797a352b4e9e4ca36026ccb92fc379f0cffa";
- sha256 = "0pvmij11b5vdxl2dxpsf4qfyl3fify36npbphwl4jq664dz5akdz";
+ rev = "8cb8e83ffb040f25cefa597f21608ca6a64aed70";
+ sha256 = "1mdi0kbc1k4q8mw8f4anl819mgsll1sj38dd2w1a1lscg179j062";
};
};
@@ -3238,12 +3238,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2019-03-11";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "1d45a6d4f094127b113470d7710695b280224933";
- sha256 = "1lcvj5q8x0vmx8rnsn4aa2js7ihz99i1b5lj13vlws04rlaf3iga";
+ rev = "a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5";
+ sha256 = "0mgxbyz1yimavay54s6a5hv88d497qngp4i06g248d0qf3ivyvrv";
};
};
@@ -3304,12 +3304,12 @@ let
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
- version = "2019-03-01";
+ version = "2019-03-17";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
- rev = "a2bb7be01815dab286735928001a009bcdb0d946";
- sha256 = "1yrg74h2lha4h1c1gxxj2sy462gn6h000bikhfbqk6lmqk2x9afv";
+ rev = "ed236e0e3fa9d4c5c286581ee68b6fa7d976674b";
+ sha256 = "13gq9qrqdwyiwk6whv4ji77xswbwphji1zgrgiid9l27a9ald43s";
};
};
@@ -3337,12 +3337,12 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2018-11-16";
+ version = "2019-03-20";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324";
- sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr";
+ rev = "57a350e6327af0074c4bc0d30b62662dfdb993af";
+ sha256 = "1vgcy8xc8v0g5g4h1h6dcl0ggg2rxp2pisxj04w5d78qf8b48njc";
};
};
@@ -3425,12 +3425,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
- version = "2019-03-15";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
- rev = "c38d4002e025b568fcd7c26f3fe68cc78c5a8f31";
- sha256 = "1hxbzj7nmf29n4s5nxqm7y7srcxgdl60x5h6mxmvng5b0c9hlbb4";
+ rev = "7afad33753b6ca6d0ff4d98fbc0ab29b6692a7b7";
+ sha256 = "0xlkrni8dh0s6c77k2j507fis839vdbbcc70gs9rqhgw7aykhjvr";
};
};
@@ -3480,12 +3480,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-03-11";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "08f95628717ebca76e60643e76a84904a4520051";
- sha256 = "1bdmdi72zb87rjz6h03zkmvw2nvpqifsyx5imhz9lc7kjgw53k47";
+ rev = "cbbf1559166f9c308ae0f4634c11bdf282ddafba";
+ sha256 = "1hyn8fxaa7r55s51q9axm1awd10xmw29bmsfizy92vs3a8dxcqny";
};
};
@@ -3524,12 +3524,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2019-03-12";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "a56917282b58c047c64d560aada4029dafeb05ff";
- sha256 = "1g1imvyz34x75c6b9sr4r75ph0zbzy2gglq82mgld67vdpq14ww7";
+ rev = "e4d35cc913336d4e17e147c88120e10f58562b4c";
+ sha256 = "1kqx113dmsv8pm88g6lp8ahkyib78zln3iz4cls59r1803q1wf97";
};
};
@@ -3557,12 +3557,12 @@ let
vim-surround = buildVimPluginFrom2Nix {
pname = "vim-surround";
- version = "2018-07-23";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-surround";
- rev = "597068870b8f093a8b2d11536c62ff31222ee8d0";
- sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x";
+ rev = "ca58a2d886cc18734c90c9665da4775d444b0c04";
+ sha256 = "0d4jxp1ahwrwsk277yvkbk76jrhmv3bml83fivlxpj01224kdr2n";
};
};
@@ -3579,12 +3579,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
- version = "2019-02-20";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
- rev = "fdfcb85fb3765f6aede3e909401c24a65e318740";
- sha256 = "136xqj246rckpc01h5y3ax6mnrhb0i22api8wd2dlqsh53glp9p6";
+ rev = "a40ef26c5cc1806d3faae829fa149506715ce56f";
+ sha256 = "0fis0w3xpsg4wfss61vydic6zisg5bdyvb0wcaf5z4fs5sk380x6";
};
};
@@ -3623,12 +3623,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2019-03-12";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
- rev = "d6ef5871ad7cbc73ee9b1bf1ff3a2b694aa3e3d4";
- sha256 = "0r36q8qqlpkv28byv62f0sqkj1pvnn58ay2c45mzh9awvc47qs76";
+ rev = "3c151018ce62b526e0bb4261b416a892c3945dc1";
+ sha256 = "0w4lh9l3fh3vfggy6am34vhh1844v3lqhv9fm22y9yvdjf995aa3";
};
};
@@ -3645,12 +3645,12 @@ let
vim-themis = buildVimPluginFrom2Nix {
pname = "vim-themis";
- version = "2017-12-27";
+ version = "2019-03-26";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-themis";
- rev = "691cd3912ba318dbd8d9fa0035fee629b424766d";
- sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd";
+ rev = "f95b4a888a91cc9373cf2f801658287ff984592f";
+ sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg";
};
};
@@ -3700,12 +3700,12 @@ let
vim-unimpaired = buildVimPluginFrom2Nix {
pname = "vim-unimpaired";
- version = "2019-03-14";
+ version = "2019-03-21";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-unimpaired";
- rev = "cb23e3f94abb9db01df5e57cc1ac23a4f42aa6a7";
- sha256 = "18jhlbs93qva5bdwl0j1p631r58j2ppaq9y9ka864m5hjbzvfnr6";
+ rev = "e77923053fbce11323194ed04113b8d966be959c";
+ sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak";
};
};
@@ -3733,23 +3733,23 @@ let
vim-vue = buildVimPluginFrom2Nix {
pname = "vim-vue";
- version = "2018-11-11";
+ version = "2019-03-22";
src = fetchFromGitHub {
owner = "posva";
repo = "vim-vue";
- rev = "e306929b27bea08ab505de7a4617e642b56b6dcd";
- sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16";
+ rev = "c7b133a66ec9dcf2200d1d2a4a7ad38909c5f539";
+ sha256 = "1bmpwh0lhdbh6z39w2i27rirc6iy3jd89gp47xmfmgvw7fk1szn4";
};
};
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
- version = "2019-03-13";
+ version = "2019-03-17";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
- rev = "5ccfd1b31a290fdb5ee50a31f1629ed5df5cd8a4";
- sha256 = "0avldkcnl1nbz09lq58yrh9cw6gia5wyz3li1gck85j1cnhf1c8x";
+ rev = "e287f95b596b832585439f77fad4b1e039d6d217";
+ sha256 = "19all4i5f1kxf092qjnbxwcg18w1zllpnhf2ma9idj0ccbpl2ds5";
};
};
@@ -3788,12 +3788,12 @@ let
vim-xkbswitch = buildVimPluginFrom2Nix {
pname = "vim-xkbswitch";
- version = "2017-03-27";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "lyokha";
repo = "vim-xkbswitch";
- rev = "a85ebddb9038e6b05138c48868a319a9e13d1868";
- sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr";
+ rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9";
+ sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm";
};
};
@@ -3865,12 +3865,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-03-09";
+ version = "2019-03-29";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "3e23e22d1d15575c25e656503d3a650ad91d0ea4";
- sha256 = "15mwmfgl9w1j8bvida59k6hydgx2x7a78j611lhxrnm89fmkxfka";
+ rev = "de82404c995cf8c529c3fb5cd8a8367e37e66c44";
+ sha256 = "1ysm5vva5v72nxlhi27lqxccsvq4j5xk78rs1zgiqki63zdacbp0";
};
};
@@ -3887,12 +3887,12 @@ let
vimwiki = buildVimPluginFrom2Nix {
pname = "vimwiki";
- version = "2019-03-09";
+ version = "2019-03-20";
src = fetchFromGitHub {
owner = "vimwiki";
repo = "vimwiki";
- rev = "5ab8f8672e6832da8f5a7eb371d2b24e8e0fff2c";
- sha256 = "0rcwng10l23gqbp3mc3i82vs56jzq5dikgcsj875bb9rhi23driy";
+ rev = "a5ef4787505cb0c10544ef0a76fe9efbbc546972";
+ sha256 = "0dh13ixkxp3fbbysxxd0rpmm5g7gaj0sa2d2bihlba8pf4dw3iv1";
};
};
@@ -4009,12 +4009,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-03-14";
+ version = "2019-03-19";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "299f8e48e7d34e780d24b4956cd61e4d42a139eb";
- sha256 = "1ix7qv2ijs2i49p6c654wvsqcar25w4w71m0f8i4n0bh7wgc1g33";
+ rev = "25ebc0b9abb1b135c809ee850085a0305cbc5533";
+ sha256 = "0jv8h8wx8486n8add2ispcr7np278rvdndb2az4s72plh59xk05d";
fetchSubmodules = true;
};
};
@@ -4054,12 +4054,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2019-02-22";
+ version = "2019-03-25";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
- rev = "1036ba58daceb4df155f4b14485eb4864b4c7827";
- sha256 = "0023rdin6n4d1hyxslp3cdag41y4yby9b7ckxf14yxg66v5ylm54";
+ rev = "d9b8d83369dac67214097fa79c9c504d6e1ede41";
+ sha256 = "1nxlvaxnspmf5gwjm3scqhpj4a7y1db1062dskpxqjp5qnixacp2";
};
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 23914e02c01c..c3865fa1e00f 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -2,7 +2,7 @@
, python, cmake, meson, vim, ruby
, which, fetchgit, fetchurl
, llvmPackages, rustPlatform
-, xkb-switch, fzf, skim
+, xkb-switch, fzf, skim, stylish-haskell
, python3, boost, icu, ncurses
, ycmd, rake
, gobject-introspection, glib, wrapGAppsHook
@@ -405,4 +405,12 @@ self: super: {
};
});
+ vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
+ postPatch = old.postPatch or "" + ''
+ substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \
+ 'g:stylish_haskell_command = "stylish-haskell"' \
+ 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"'
+ '';
+ });
+
}
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 9117364b8205..b7d0a4d951ef 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -52,5 +52,17 @@ rec {
ms-python.python = callPackage ./python {};
+ vscodevim.vim = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vim";
+ publisher = "vscodevim";
+ version = "1.2.0";
+ sha256 = "0c7nv3razc3xjjzmb0q9a89dgry77h79rbkmc8nbfpa1if7lsvcp";
+ };
+ meta = {
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
WakaTime.vscode-wakatime = callPackage ./wakatime {};
}
diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index df69cb7065ba..746eeef83668 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -8,13 +8,13 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
- version = "1.2.7";
- sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn";
+ version = "1.2.13";
+ sha256 = "0zidlc1flgw8h9l5ph98xh6anxhggk4vpmq6k1k2sfzrrjypymgf";
};
postPatch = ''
- mkdir -p dist/wakatime-master
- cp -rt dist/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
+ mkdir -p wakatime-master
+ cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
'';
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index bd85b6620ba6..a21a0bb58bd8 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -16,11 +16,36 @@
, protobufc
, python
, lxc
+, writeText
+, writeScript
+, runtimeShell
}:
+let
+
+ dbus-service = writeText "org.anbox.service" ''
+ [D-BUS Service]
+ Name=org.anbox
+ Exec=@out@/libexec/anbox-session-manager
+ '';
+
+ anbox-application-manager = writeScript "anbox-application-manager" ''
+ #!${runtimeShell}
+
+ ${systemd}/bin/busctl --user call \
+ org.freedesktop.DBus \
+ /org/freedesktop/DBus \
+ org.freedesktop.DBus \
+ StartServiceByName "su" org.anbox 0
+
+ @out@/bin/anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
+ '';
+
+in
+
stdenv.mkDerivation rec {
pname = "anbox";
- version = "2019-03-07";
+ version = "unstable-2019-03-07";
src = fetchFromGitHub {
owner = pname;
@@ -29,10 +54,14 @@ stdenv.mkDerivation rec {
sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz";
};
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
buildInputs = [
cmake pkgconfig dbus boost libcap gtest systemd mesa glib
SDL2 SDL2_image protobuf protobufc properties-cpp lxc python
- makeWrapper libGL
+ libGL
];
patchPhase = ''
@@ -68,60 +97,42 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \
--prefix PATH : ${git}/bin
- mkdir -p $out/share/dbus-1/services/
- cat < $out/share/dbus-1/services/org.anbox.service
- [D-BUS Service]
- Name=org.anbox
- Exec=$out/libexec/anbox-session-manager
- END
+ mkdir -p $out/share/dbus-1/services
+ substitute ${dbus-service} $out/share/dbus-1/services/org.anbox.service \
+ --subst-var out
mkdir $out/libexec
- cat > $out/libexec/anbox-session-manager < $out/bin/anbox-application-manager <ypad_pos < 1000) {
+- if (tab_names[current_tab] == "Tunables" || "WakeUp") {
++ if (tab_names[current_tab] == "Tunables" || tab_names[current_tab] == "WakeUp") {
+ if ((w->cursor_pos + 7) >= LINES) {
+ prefresh(w->win, ++w->ypad_pos, w->xpad_pos,
+ 1, 0, LINES - 3, COLS - 1);
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 89375563ae67..039d875060a2 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -17,8 +17,8 @@ buildPythonApplication rec {
sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
};
- nativeBuildInputs = [ bison flex ];
- buildInputs = [ libsepol swig ];
+ nativeBuildInputs = [ bison flex swig ];
+ buildInputs = [ libsepol ];
propagatedBuildInputs = [ enum34 libselinux networkx ]
++ optionals withGraphics [ pyqt5 ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2f873f34b885..d54972c055be 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -34,10 +34,12 @@ in stdenv.mkDerivation rec {
# Upstream's maintenance branches are still too intrusive:
# https://github.com/systemd/systemd-stable/tree/v239-stable
patches-deb = fetchurl {
- # When the URL disappears, it typically means that Debian has new patches
- # (probably security) and updating to new tarball will apply them as well.
+ # This URL should point to a stable location that does not easily
+ # disappear. In the past we were using `mirror://debian` but that
+ # eventually causes the files to disappear. While that was a good sign
+ # for us to update our patch collection it does break reproducibility.
name = "systemd-debian-patches.tar.xz";
- url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz;
+ url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz;
sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg";
};
# Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 348a9a88566b..8b65fa65f22b 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -34,9 +34,14 @@ let
sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
};
"2.1" = {
- kafkaVersion = "2.1.0";
+ kafkaVersion = "2.1.1";
scalaVersion = "2.12";
- sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7";
+ sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0";
+ };
+ "2.2" = {
+ kafkaVersion = "2.2.0";
+ scalaVersion = "2.12";
+ sha256 = "09q028kagpkzrvfdb040z8q9mspv8n7f2igrd1cs73v7mr7n42d0";
};
};
in
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 37f93c8e87e8..1b9f1e698d4d 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, fetchsvn,
- jansson, libxml2, libxslt, ncurses, openssl, sqlite,
+ jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
utillinux, dmidecode, libuuid, newt,
lua, speex,
- srtp, wget, curl, iksemel
+ srtp, wget, curl, iksemel, pkgconfig
}:
let
@@ -10,7 +10,11 @@ let
inherit version;
name = "asterisk-${version}";
- buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ];
+ buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
+ dmidecode libuuid newt
+ lua speex
+ srtp wget curl iksemel ];
+ nativeBuildInputs = [ utillinux pkgconfig ];
patches = [
# We want the Makefile to install the default /var skeleton
@@ -39,8 +43,11 @@ let
# you're likely missing an automatically downloaded dependency
preConfigure = ''
mkdir externals_cache
- '' + lib.concatStringsSep "\n"
- (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + ''
+
+ ${lib.concatStringsSep "\n"
+ (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals)}
+
+ ${lib.optionalString (externals ? "addons/mp3") "bash contrib/scripts/get_mp3_source.sh || true"}
chmod -w externals_cache
'';
@@ -53,7 +60,9 @@ let
preBuild = ''
make menuselect.makeopts
- substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
+ ${lib.optionalString (externals ? "addons/mp3") ''
+ substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
+ ''}
'';
postInstall = ''
@@ -69,56 +78,78 @@ let
};
};
- pjproject-27 = fetchurl {
+ pjproject_2_7_1 = fetchurl {
url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2;
sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
};
+ pjproject_2_8 = fetchurl {
+ url = http://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2;
+ sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
+ };
+
mp3-202 = fetchsvn {
url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
rev = "202";
sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
};
-in
-{
+in rec {
+ # Supported releases (as of 2018-11-20).
+ #
+ # Series Type Rel. Date Sec. Fixes EOL
+ # 13.x LTS 2014-10-24 2020-10-24 2021-10-24
+ # 15.x Standard 2017-10-03 2018-10-03 2019-10-03
+ asterisk-stable = asterisk_15;
+ # 16.x LTS 2018-10-09 2022-10-09 2023-10-09
+ asterisk-lts = asterisk_16;
+ asterisk = asterisk_16;
- asterisk-lts = common {
- version = "13.20.0";
- sha256 = "a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5";
+ asterisk_13 = common {
+ version = "13.24.1";
+ sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3";
externals = {
- "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27;
+ "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1;
"addons/mp3" = mp3-202;
};
};
- asterisk-stable = common {
- version = "15.3.0";
- sha256 = "f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c";
+ asterisk_15 = common {
+ version = "15.7.0";
+ sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv";
externals = {
- "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27;
+ "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
"addons/mp3" = mp3-202;
};
};
- # asterisk-git = common {
- # version = "15-pre";
- # sha256 = "...";
- # externals = {
+ asterisk_16 = common {
+ version = "16.1.1";
+ sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv";
+ externals = {
+ "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
+ "addons/mp3" = mp3-202;
+ };
+ };
+
+ #asterisk-git = common {
+ # version = "15-pre";
+ # sha256 = "...";
+ # externals = {
# "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
- # Note that these sounds are included with the release tarball. They are
- # provided here verbatim for the convenience of anyone wanting to build
- # Asterisk from other sources. Include in externals.
- # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
- # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
- # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
- # };
- # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
- # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
- # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
- # };
- # TODO: Sounds for other languages could be added here
- # }
- # }.overrideDerivation (_: {src = fetchgit {...}})
+ # # Note that these sounds are included with the release tarball. They are
+ # # provided here verbatim for the convenience of anyone wanting to build
+ # # Asterisk from other sources. Include in externals.
+ # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
+ # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+ # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
+ # };
+ # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
+ # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
+ # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
+ # };
+ # # TODO: Sounds for other languages could be added here
+ # }
+ #}.overrideDerivation (_: {src = fetchgit {...}})
}
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index fff678395319..722ae26b166a 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "powerdns-${version}";
- version = "4.1.6";
+ version = "4.1.7";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
- sha256 = "0ggpcvzj90a31qf71m8788ql0hbxnkb9y6c3wgqr9l0qwv8dsgpm";
+ sha256 = "11c4r0mbq6ybbihm0jbl9hspb01pj1gi6x3m374liw9jij7dw8b4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 046aa1bb4251..778b132bb700 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.89.2";
+ version = "0.90.2";
components = {
"abode" = ps: with ps; [ ];
"abode.alarm_control_panel" = ps: with ps; [ ];
@@ -60,6 +60,8 @@
"android_ip_webcam.binary_sensor" = ps: with ps; [ ];
"android_ip_webcam.sensor" = ps: with ps; [ ];
"android_ip_webcam.switch" = ps: with ps; [ ];
+ "androidtv" = ps: with ps; [ ];
+ "androidtv.media_player" = ps: with ps; [ ];
"apcupsd" = ps: with ps; [ ];
"apcupsd.binary_sensor" = ps: with ps; [ ];
"apcupsd.sensor" = ps: with ps; [ ];
@@ -180,6 +182,8 @@
"canary" = ps: with ps; [ ];
"cast" = ps: with ps; [ PyChromecast ];
"cast.media_player" = ps: with ps; [ PyChromecast ];
+ "cisco_mobility_express" = ps: with ps; [ ];
+ "cisco_mobility_express.device_tracker" = ps: with ps; [ ];
"climate" = ps: with ps; [ ];
"climate.const" = ps: with ps; [ ];
"climate.coolmaster" = ps: with ps; [ ];
@@ -202,13 +206,10 @@
"climate.touchline" = ps: with ps; [ ];
"climate.venstar" = ps: with ps; [ ];
"climate.zhong_hong" = ps: with ps; [ ];
- "cloud" = ps: with ps; [ aiohttp-cors warrant ];
- "cloud.auth_api" = ps: with ps; [ ];
- "cloud.cloud_api" = ps: with ps; [ ];
- "cloud.cloudhooks" = ps: with ps; [ ];
+ "cloud" = ps: with ps; [ aiohttp-cors ];
+ "cloud.binary_sensor" = ps: with ps; [ aiohttp-cors ];
"cloud.const" = ps: with ps; [ ];
"cloud.http_api" = ps: with ps; [ ];
- "cloud.iot" = ps: with ps; [ ];
"cloud.prefs" = ps: with ps; [ ];
"cloud.utils" = ps: with ps; [ ];
"cloudflare" = ps: with ps; [ ];
@@ -217,16 +218,15 @@
"comfoconnect.fan" = ps: with ps; [ ];
"comfoconnect.sensor" = ps: with ps; [ ];
"config" = ps: with ps; [ aiohttp-cors ];
- "config.area_registry" = ps: with ps; [ aiohttp-cors ];
+ "config.area_registry" = ps: with ps; [ ];
"config.auth" = ps: with ps; [ ];
"config.automation" = ps: with ps; [ ];
"config.config_entries" = ps: with ps; [ ];
"config.core" = ps: with ps; [ ];
"config.customize" = ps: with ps; [ ];
- "config.device_registry" = ps: with ps; [ aiohttp-cors ];
- "config.entity_registry" = ps: with ps; [ aiohttp-cors ];
+ "config.device_registry" = ps: with ps; [ ];
+ "config.entity_registry" = ps: with ps; [ ];
"config.group" = ps: with ps; [ ];
- "config.hassbian" = ps: with ps; [ ];
"config.script" = ps: with ps; [ ];
"config.zwave" = ps: with ps; [ ];
"configurator" = ps: with ps; [ ];
@@ -245,6 +245,8 @@
"cover.opengarage" = ps: with ps; [ ];
"cover.rflink" = ps: with ps; [ ];
"cover.template" = ps: with ps; [ ];
+ "cppm_tracker" = ps: with ps; [ ];
+ "cppm_tracker.device_tracker" = ps: with ps; [ ];
"daikin" = ps: with ps; [ ];
"daikin.climate" = ps: with ps; [ ];
"daikin.config_flow" = ps: with ps; [ ];
@@ -267,7 +269,7 @@
"deconz.scene" = ps: with ps; [ ];
"deconz.sensor" = ps: with ps; [ ];
"deconz.switch" = ps: with ps; [ ];
- "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy warrant ];
+ "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ];
"demo" = ps: with ps; [ aiohttp-cors ];
"demo.remote" = ps: with ps; [ ];
"device_sun_light_trigger" = ps: with ps; [ ];
@@ -317,6 +319,7 @@
"device_tracker.unifi" = ps: with ps; [ pyunifi ];
"device_tracker.unifi_direct" = ps: with ps; [ pexpect ];
"device_tracker.upc_connect" = ps: with ps; [ defusedxml ];
+ "device_tracker.xfinity" = ps: with ps; [ ];
"device_tracker.xiaomi" = ps: with ps; [ ];
"dialogflow" = ps: with ps; [ aiohttp-cors ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
@@ -373,6 +376,8 @@
"emulated_roku.binding" = ps: with ps; [ ];
"emulated_roku.config_flow" = ps: with ps; [ ];
"emulated_roku.const" = ps: with ps; [ ];
+ "enigma2" = ps: with ps; [ ];
+ "enigma2.media_player" = ps: with ps; [ ];
"enocean" = ps: with ps; [ ];
"enocean.binary_sensor" = ps: with ps; [ ];
"enocean.light" = ps: with ps; [ ];
@@ -382,7 +387,7 @@
"envisalink.alarm_control_panel" = ps: with ps; [ ];
"envisalink.binary_sensor" = ps: with ps; [ ];
"envisalink.sensor" = ps: with ps; [ ];
- "esphome" = ps: with ps; [ ];
+ "esphome" = ps: with ps; [ aioesphomeapi ];
"esphome.binary_sensor" = ps: with ps; [ ];
"esphome.config_flow" = ps: with ps; [ ];
"esphome.cover" = ps: with ps; [ ];
@@ -490,9 +495,13 @@
"homekit_controller.alarm_control_panel" = ps: with ps; [ ];
"homekit_controller.binary_sensor" = ps: with ps; [ ];
"homekit_controller.climate" = ps: with ps; [ ];
+ "homekit_controller.config_flow" = ps: with ps; [ ];
+ "homekit_controller.connection" = ps: with ps; [ ];
+ "homekit_controller.const" = ps: with ps; [ ];
"homekit_controller.cover" = ps: with ps; [ ];
"homekit_controller.light" = ps: with ps; [ ];
"homekit_controller.lock" = ps: with ps; [ ];
+ "homekit_controller.sensor" = ps: with ps; [ ];
"homekit_controller.switch" = ps: with ps; [ ];
"homematic" = ps: with ps; [ pyhomematic ];
"homematic.binary_sensor" = ps: with ps; [ pyhomematic ];
@@ -516,6 +525,7 @@
"homematicip_cloud.light" = ps: with ps; [ ];
"homematicip_cloud.sensor" = ps: with ps; [ ];
"homematicip_cloud.switch" = ps: with ps; [ ];
+ "homematicip_cloud.weather" = ps: with ps; [ ];
"homeworks" = ps: with ps; [ ];
"homeworks.light" = ps: with ps; [ ];
"http" = ps: with ps; [ aiohttp-cors ];
@@ -551,6 +561,7 @@
"ihc.light" = ps: with ps; [ defusedxml ];
"ihc.sensor" = ps: with ps; [ defusedxml ];
"ihc.switch" = ps: with ps; [ defusedxml ];
+ "ihc.util" = ps: with ps; [ ];
"image_processing" = ps: with ps; [ aiohttp-cors ];
"image_processing.demo" = ps: with ps; [ ];
"image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
@@ -622,6 +633,9 @@
"knx.switch" = ps: with ps; [ ];
"konnected" = ps: with ps; [ aiohttp-cors ];
"konnected.binary_sensor" = ps: with ps; [ aiohttp-cors ];
+ "konnected.const" = ps: with ps; [ ];
+ "konnected.handlers" = ps: with ps; [ ];
+ "konnected.sensor" = ps: with ps; [ aiohttp-cors ];
"konnected.switch" = ps: with ps; [ aiohttp-cors ];
"lametric" = ps: with ps; [ ];
"lametric.notify" = ps: with ps; [ ];
@@ -651,7 +665,7 @@
"light.litejet" = ps: with ps; [ ];
"light.lw12wifi" = ps: with ps; [ ];
"light.mystrom" = ps: with ps; [ ];
- "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
+ "light.nanoleaf" = ps: with ps; [ ];
"light.niko_home_control" = ps: with ps; [ ];
"light.opple" = ps: with ps; [ ];
"light.osramlightify" = ps: with ps; [ ];
@@ -739,7 +753,6 @@
"media_player.dunehd" = ps: with ps; [ ];
"media_player.emby" = ps: with ps; [ ];
"media_player.epson" = ps: with ps; [ ];
- "media_player.firetv" = ps: with ps; [ firetv ];
"media_player.frontier_silicon" = ps: with ps; [ ];
"media_player.gpmdp" = ps: with ps; [ websocket_client ];
"media_player.gstreamer" = ps: with ps; [ ];
@@ -788,6 +801,14 @@
"meteo_france.weather" = ps: with ps; [ ];
"microsoft_face" = ps: with ps; [ aiohttp-cors ];
"mobile_app" = ps: with ps; [ pynacl aiohttp-cors ];
+ "mobile_app.binary_sensor" = ps: with ps; [ pynacl aiohttp-cors ];
+ "mobile_app.const" = ps: with ps; [ ];
+ "mobile_app.entity" = ps: with ps; [ ];
+ "mobile_app.helpers" = ps: with ps; [ ];
+ "mobile_app.http_api" = ps: with ps; [ ];
+ "mobile_app.sensor" = ps: with ps; [ pynacl aiohttp-cors ];
+ "mobile_app.webhook" = ps: with ps; [ ];
+ "mobile_app.websocket_api" = ps: with ps; [ ];
"mochad" = ps: with ps; [ ];
"mochad.light" = ps: with ps; [ ];
"mochad.switch" = ps: with ps; [ ];
@@ -1305,6 +1326,11 @@
"spider.switch" = ps: with ps; [ ];
"splunk" = ps: with ps; [ ];
"statsd" = ps: with ps; [ statsd ];
+ "stream" = ps: with ps; [ aiohttp-cors av ];
+ "stream.const" = ps: with ps; [ ];
+ "stream.core" = ps: with ps; [ ];
+ "stream.hls" = ps: with ps; [ ];
+ "stream.worker" = ps: with ps; [ ];
"sun" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
"switch.acer_projector" = ps: with ps; [ pyserial ];
@@ -1391,6 +1417,8 @@
"tibber.notify" = ps: with ps; [ ];
"tibber.sensor" = ps: with ps; [ ];
"timer" = ps: with ps; [ ];
+ "tof" = ps: with ps; [ ];
+ "tof.sensor" = ps: with ps; [ ];
"toon" = ps: with ps; [ ];
"toon.binary_sensor" = ps: with ps; [ ];
"toon.climate" = ps: with ps; [ ];
@@ -1516,6 +1544,7 @@
"websocket_api.error" = ps: with ps; [ ];
"websocket_api.http" = ps: with ps; [ ];
"websocket_api.messages" = ps: with ps; [ ];
+ "websocket_api.permissions" = ps: with ps; [ ];
"wemo" = ps: with ps; [ ];
"wemo.binary_sensor" = ps: with ps; [ ];
"wemo.fan" = ps: with ps; [ ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 6b146459e8f1..9e5fb6bfb008 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -44,6 +44,8 @@ let
"15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik")
(mkOverride "python-slugify" "1.2.6"
"7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245")
+ (mkOverride "pyyaml" "3.13"
+ "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf")
(mkOverride "requests" "2.21.0"
"502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e")
(mkOverride "ruamel_yaml" "0.15.88"
@@ -95,7 +97,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.89.2";
+ hassVersion = "0.90.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -110,7 +112,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
- sha256 = "1k91mq45nq80dwkzqrlax7bvmv556ipr3pqh7i3k1lcaryn5p0l7";
+ sha256 = "0byikidvrvx8nxgddhpqz609rxb91j1kcppziv4ibb57g6lj7iwx";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index cb5ddbc9c50e..a011e35ae64e 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,15 +2,18 @@
buildPythonPackage rec {
pname = "home-assistant-frontend";
- version = "20190305.1";
+ version = "20190321.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1b07b7efb3e0004df752f9aa40c42e80d5da13371f48df8e21c7579093849aae";
+ sha256 = "0sk96mnmvsbcqjjcrlgfsxkywms0zmajjgn3ibvk4sfn5wn53bg7";
};
propagatedBuildInputs = [ user-agents ];
+ # no Python tests implemented
+ doCheck = false;
+
meta = with lib; {
description = "Polymer frontend for Home Assistant";
homepage = https://github.com/home-assistant/home-assistant-polymer;
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 64e57f64236e..5933a71e5159 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
- version = "2.4.38";
+ version = "2.4.39";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx";
+ sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml";
};
# FIXME: -dev depends on -doc
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index db459dc81c8e..2993809c5563 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
assert enableExtendedAttrs -> attr != null;
stdenv.mkDerivation rec {
- name = "lighttpd-1.4.52";
+ name = "lighttpd-1.4.53";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
- sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17";
+ sha256 = "0y6b3lvv0cmn7mlm832k7z31fmrc6hazn9lcd9ahlrg9ycfcxprv";
};
postPatch = ''
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 691ca014257b..02bef43c184f 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -9,6 +9,17 @@
with stdenv.lib;
+let
+
+ mapModules = attrPath: flip concatMap modules
+ (mod:
+ let supports = mod.supports or (_: true);
+ in
+ if supports version then mod.${attrPath} or []
+ else throw "Module at ${toString mod.src} does not support nginx version ${version}!");
+
+in
+
stdenv.mkDerivation {
name = "nginx-${version}";
@@ -18,7 +29,7 @@ stdenv.mkDerivation {
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ]
- ++ concatMap (mod: mod.inputs or []) modules;
+ ++ mapModules "inputs";
configureFlags = [
"--with-http_ssl_module"
@@ -77,7 +88,7 @@ stdenv.mkDerivation {
url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch";
sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd";
})
- ];
+ ] ++ mapModules "patches";
hardeningEnable = optional (!stdenv.isDarwin) "pie";
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index d86a78187e5f..d7ee0a0af0a9 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
- version = "1.15.9";
- sha256 = "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4";
+ version = "1.15.10";
+ sha256 = "0g3wadbf9r730p0j5c0pnsmbmbrwvvnpyzhgbmsf9g2jplx78rdq";
})
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 57884bcfdb96..6a0114a6ba55 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,5 +1,22 @@
{ fetchFromGitHub, lib, pkgs }:
+let
+
+ http_proxy_connect_module_generic = patchName: rec {
+ src = fetchFromGitHub {
+ owner = "chobits";
+ repo = "ngx_http_proxy_connect_module";
+ rev = "8201639082cba702211585b03d4cc7bc51c65167";
+ sha256 = "0z71x3xnlczrr2kq43w3drxj9g14fkk4jz66x921v0yb8r9mnn5a";
+ };
+
+ patches = [
+ "${src}/patch/${patchName}.patch"
+ ];
+ };
+
+in
+
{
brotli = {
src = let gitsrc = pkgs.fetchFromGitHub {
@@ -318,4 +335,12 @@
sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
};
};
+
+ http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // {
+ supports = with lib.versions; version: major version == "1" && minor version == "15";
+ };
+
+ http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // {
+ supports = with lib.versions; version: major version == "1" && minor version == "14";
+ };
}
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index c96eed7a57b3..912e520180e6 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -3,15 +3,15 @@
buildGoPackage rec {
name = "hydron-unstable-${version}";
- version = "2018-10-08";
+ version = "2019-02-17";
goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix;
src = fetchFromGitHub {
owner = "bakape";
repo = "hydron";
- rev = "0a834bcaf9af3a6bac8873fad981aa3736115258";
- sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww";
+ rev = "824789fb108966432e507143db39b358dd7ff233";
+ sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn";
};
enableParallelBuilding = true;
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
index 92ac9a8325d9..08f165af76b2 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/pkgs/servers/hydron/deps.nix
@@ -5,8 +5,17 @@
fetch = {
type = "git";
url = "https://github.com/Masterminds/squirrel";
- rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
- sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
+ rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c";
+ sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq";
+ };
+ }
+ {
+ goPackagePath = "github.com/bakape/boorufetch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bakape/boorufetch";
+ rev = "90aee10269a138a08ce49cd91635500336657a82";
+ sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk";
};
}
{
@@ -14,8 +23,17 @@
fetch = {
type = "git";
url = "https://github.com/bakape/thumbnailer";
- rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
- sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
+ rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949";
+ sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk";
+ };
+ }
+ {
+ goPackagePath = "github.com/chai2010/webp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chai2010/webp";
+ rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab";
+ sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh";
};
}
{
@@ -23,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/dimfeld/httptreemux";
- rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
- sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
+ rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff";
+ sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp";
};
}
{
@@ -32,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/handlers";
- rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
- sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
+ rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05";
+ sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli";
};
}
{
@@ -63,13 +81,31 @@
sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10";
};
}
+ {
+ goPackagePath = "github.com/mailru/easyjson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mailru/easyjson";
+ rev = "1de009706dbeb9d05f18586f0735fcdb7c524481";
+ sha256 = "0y4wq6wwj9ivqr397wcr6n0bd9m85qpk367bp65hkfi9x3mnlcb4";
+ };
+ }
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
- rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
- sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
+ rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1";
+ sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz";
+ };
+ }
+ {
+ goPackagePath = "github.com/nwaples/rardecode";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nwaples/rardecode";
+ rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7";
+ sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g";
};
}
{
@@ -86,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/valyala/quicktemplate";
- rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
- sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
+ rev = "d08324ac14fa81325830fae7eb30188ec68427f8";
+ sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx";
};
}
{
@@ -95,8 +131,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
- sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
+ rev = "d8887717615a059821345a5c23649351b52a1c0b";
+ sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
};
}
]
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index f3b67741c191..5194ab278bf7 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, openssl, pam, libiconv }:
stdenv.mkDerivation rec {
- name = "ngircd-24";
+ name = "ngircd-25";
src = fetchurl {
url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
- sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
+ sha256 = "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4";
};
configureFlags = [
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 2d9d2fe0f154..802c6698df64 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -9,7 +9,7 @@
}:
stdenv.mkDerivation rec {
- name = "dovecot-2.3.4.1";
+ name = "dovecot-2.3.5.1";
nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
- sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq";
+ sha256 = "0gy3qzwbp6zsyn44pcfq8iiv9iy9q7z6py30h60alb1vkr3rv3yp";
};
enableParallelBuilding = true;
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 73d6b5d593c9..0dc037a06ca7 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "dovecot-pigeonhole-${version}";
- version = "0.5.4";
+ version = "0.5.5";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
- sha256 = "05l5y0gc8ycswdbl58j7kbx5gq1z7mjkazjccmgbq6h0gbk9jyal";
+ sha256 = "19a9a6rdvdlrm00k2npprj6lrikjhngnmpgg412848rb3ip11anb";
};
buildInputs = [ dovecot openssl ];
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 4c1420b1ae20..634bba2e57c9 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
name = "postfix-${version}";
- version = "3.4.3";
+ version = "3.4.5";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
- sha256 = "1c4ga3p0jshs9xyfq07j6jl9hj42p47q6nbmy42cijax90bhayz3";
+ sha256 = "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb";
};
nativeBuildInputs = [ makeWrapper m4 ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 783c0b5bde82..d942e5fa8d31 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
in buildPythonApplication rec {
pname = "matrix-synapse";
- version = "0.99.2";
+ version = "0.99.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0y6vic0fjx9k8178vsns0ab4ngqx8qhiyampqnil0b1biqcd68bw";
+ sha256 = "03300dplzckydwfvbn4w1sfc77b461cvgpi3qkhbv9jnnzz5y28g";
};
patches = [
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index ea3fbd58e2eb..f6526ab1f715 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "mautrix-unstable-${version}";
- version = "2019-02-11";
+ version = "2019-02-24";
goPackagePath = "maunium.net/go/mautrix-whatsapp";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
- rev = "f689297ba6704265a938951f307b365e829fcfa1";
- sha256 = "1658bika9ylhm64k9lxavp43dxilygn6vx7yn6y1l10j8by2akxk";
+ rev = "485acf6de654b8fb70007876c074fb004eb9717b";
+ sha256 = "1v7h3s8h0aiq6g06h9j1sidw8y5aiw24sgdh9knr1c90pvvc7pmv";
};
goDeps = ./deps.nix;
diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix
index 8a1543ac012f..8624889e3468 100644
--- a/pkgs/servers/mautrix-whatsapp/deps.nix
+++ b/pkgs/servers/mautrix-whatsapp/deps.nix
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/Rhymen/go-whatsapp";
- rev = "2ca6af00572c";
- sha256 = "0lrscj59n9nmd5z0h9r2c952m0da672r3aj33bi443ap0h97w19i";
+ rev = "c1173899de99";
+ sha256 = "1f46zpbfgv3k38lgdrcwqf4cm34dgqxlfs9qzg380in61460lcri";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
- rev = "v1.6.2";
- sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ rev = "v1.7.0";
+ sha256 = "09cn5v1gxrrrydzyllp1asbhgm5xsawb92as7cg9jqg6iyqajvlc";
};
}
{
@@ -59,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
- rev = "v0.0.9";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ rev = "v0.1.1";
+ sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
};
}
{
@@ -68,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.4";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ rev = "v0.0.5";
+ sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa";
};
}
{
@@ -113,8 +113,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "ff983b9c42bc";
- sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz";
+ rev = "ffb98f73852f";
+ sha256 = "0hil543q2zq8wxsz6ljrfnrhhxg5j0mrjfwskf2x6q0ppqizsa4h";
};
}
{
@@ -140,8 +140,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "48ac38b7c8cb";
- sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin";
+ rev = "cd391775e71e";
+ sha256 = "12wk5ylx0jjajipr68yn50wcd0c9shzhq9y4an40ldnv4bsdp2rj";
};
}
{
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 504df8bae0cb..d983c0677191 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -1,34 +1,35 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript
-, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }:
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full
+, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson
+, nodePackages, emscripten, opencv, statik }:
buildGoPackage rec {
name = "meguca-unstable-${version}";
- version = "2018-12-06";
+ version = "2019-03-12";
goPackagePath = "github.com/bakape/meguca";
goDeps = ./server_deps.nix;
src = fetchFromGitHub {
owner = "bakape";
repo = "meguca";
- rev = "300b007cab238838f813faa9aad6abb3f22ad4d2";
- sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9";
+ rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525";
+ sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i";
fetchSubmodules = true;
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
- buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ];
+
+ buildInputs = [
+ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata
+ easyjson emscripten opencv statik
+ ];
buildPhase = ''
export HOME=`pwd`
- export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server
- cd $HOME/go/src/github.com/bakape/meguca
+ cd go/src/github.com/bakape/meguca
ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
sed -i "/npm install --progress false --depth 0/d" Makefile
- make generate_clean
- go generate meguca/...
- go build -v -p $NIX_BUILD_CORES meguca
- make -j $NIX_BUILD_CORES client
+ make -j $NIX_BUILD_CORES generate all
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
make -j $NIX_BUILD_CORES wasm
'';
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index 5dc53820a9d2..bff9d5624e83 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/ErikDubbelboer/gspt";
- rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0";
- sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81";
+ rev = "e68493906b8382891943ddc9960cb9c6ecd1a1f0";
+ sha256 = "17xjyg6zw02yzly30hs92pwgn0w85naixr4kb2c0mgp5zavl1ffz";
};
}
{
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/Masterminds/squirrel";
- rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
- sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
+ rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c";
+ sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq";
};
}
{
@@ -23,17 +23,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/goquery";
- rev = "2d2796f41742ece03e8086188fa4db16a3a0b458";
- sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56";
- };
- }
- {
- goPackagePath = "github.com/Soreil/apngdetector";
- fetch = {
- type = "git";
- url = "https://github.com/Soreil/apngdetector";
- rev = "e412c29dbc998dfcffe266b12587b29096ac4d46";
- sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j";
+ rev = "3dcf72e6c17f694381a21592651ca1464ded0e10";
+ sha256 = "0fpsf6b54z33a7zl28x860jbaj3g5722g8kpqs6rdpaqv99yyvnn";
};
}
{
@@ -50,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/aquilax/tripcode";
- rev = "db58da84bb12e26032493b73eb3b58ba884590ef";
- sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3";
+ rev = "1a14b0a5e89f7fdb8a821562569338ad59ab2da5";
+ sha256 = "1ishrg37gkkx04gbchhsk7jp01mmfvln2i2zrncbj4qxs2amnn2l";
};
}
{
@@ -59,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/badoux/goscraper";
- rev = "363803726ad4e2ab262b4e01362e98458df0b231";
- sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48";
+ rev = "9b4686c4b62c22b0489d53dddf5421605caba33e";
+ sha256 = "1f1wc4s2b6g1ndpihb0gn7cxmwyi4wfqi5slvsk6i6p9q4kxrkvx";
};
}
{
@@ -68,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/bakape/boorufetch";
- rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0";
- sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0";
+ rev = "90aee10269a138a08ce49cd91635500336657a82";
+ sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk";
};
}
{
@@ -77,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/bakape/captchouli";
- rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680";
- sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm";
+ rev = "b57177c8d2f239547e9545354e2f55fbc851ab47";
+ sha256 = "1fi24322bbicc2bpfla37nhy2w89cf67345dbybcavgcny5rs65a";
};
}
{
@@ -95,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/bakape/thumbnailer";
- rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
- sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
+ rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949";
+ sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk";
};
}
{
@@ -108,13 +99,22 @@
sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2";
};
}
+ {
+ goPackagePath = "github.com/chai2010/webp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chai2010/webp";
+ rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab";
+ sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh";
+ };
+ }
{
goPackagePath = "github.com/dimfeld/httptreemux";
fetch = {
type = "git";
url = "https://github.com/dimfeld/httptreemux";
- rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
- sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
+ rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff";
+ sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp";
};
}
{
@@ -122,8 +122,17 @@
fetch = {
type = "git";
url = "https://github.com/dsnet/compress";
- rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f";
- sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx";
+ rev = "da652975a8eea9fa0735aba8056747a751db0bd3";
+ sha256 = "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "11844c0959f6fff69ba325d097fce35bd85a8e93";
+ sha256 = "0driasljawka9r914530mr9df2i5cwldcgj2v94qkhzlkb48ljwc";
};
}
{
@@ -140,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/go-playground/errors";
- rev = "9aa88f624b398d37201c30583065aee54071bc0c";
- sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh";
+ rev = "4050dd2e2e3b2052ef736048661d1d23a4a4e55d";
+ sha256 = "0b3bhf2c9fpv095db3ajyb1fz7nxjn7rfg9rjb83hqfm492wjy86";
};
}
{
@@ -149,8 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/go-playground/log";
- rev = "736ecb55f80c7121af3754a7ea62e96733451fe1";
- sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh";
+ rev = "fdcdf507e3bf20900bc1a44b0cbd73fee5bcbe19";
+ sha256 = "0mbzawm09n2kggrkmj0khrhipmdi191z01mw120ahbmmjdjls749";
};
}
{
@@ -158,8 +167,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
- rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
- sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
+ rev = "2a8bb927dd31d8daada140a5d09578521ce5c36a";
+ sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is";
};
}
{
@@ -167,8 +176,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/handlers";
- rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
- sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
+ rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05";
+ sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli";
};
}
{
@@ -176,8 +185,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
- sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
+ rev = "0ec3d1bd7fe50c503d6df98ee649d81f4857c564";
+ sha256 = "0mdq489izwy20bpjg31k8qnfgvh5r7mm5yq709q6xyzmzdd5nasx";
};
}
{
@@ -221,8 +230,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
- rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
- sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
+ rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1";
+ sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz";
};
}
{
@@ -234,22 +243,13 @@
sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g";
};
}
- {
- goPackagePath = "github.com/nyarlabo/go-crypt";
- fetch = {
- type = "git";
- url = "https://github.com/nyarlabo/go-crypt";
- rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1";
- sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1";
- };
- }
{
goPackagePath = "github.com/oschwald/maxminddb-golang";
fetch = {
type = "git";
url = "https://github.com/oschwald/maxminddb-golang";
- rev = "ed835b22606182ff576f244643e52b25b7d6c4e7";
- sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw";
+ rev = "fc04c43d3c694a35570a7e4358b0f4d4ac3fea32";
+ sha256 = "16bz3g8mkg2xhb4pxcpk6scxrmn48485jgky7wvi4gzpizlhsxxq";
};
}
{
@@ -257,8 +257,8 @@
fetch = {
type = "git";
url = "https://github.com/otium/ytdl";
- rev = "0227c2bacb82a434f2332d7d8c64093615c08a40";
- sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs";
+ rev = "5c8ee71b4175be285baaff66147458254884f748";
+ sha256 = "1w22cfc6nr7z5fc3hmcymmx2xfcb66ylhfs89vn4i19ksxbkkcjk";
};
}
{
@@ -266,8 +266,17 @@
fetch = {
type = "git";
url = "https://github.com/pierrec/lz4";
- rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e";
- sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki";
+ rev = "062282ea0dcff40c9fb8525789eef9644b1fbd6e";
+ sha256 = "04lzigxv2f4yv9gr1dybsjkcnmv1lj0mx9ls2ry1pzy2l9z6i6cp";
+ };
+ }
+ {
+ goPackagePath = "github.com/rakyll/statik";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rakyll/statik";
+ rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e";
+ sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5";
};
}
{
@@ -275,8 +284,8 @@
fetch = {
type = "git";
url = "https://github.com/sevlyar/go-daemon";
- rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1";
- sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01";
+ rev = "fedf95d0cd0be92511436dbc84c290ff1c104f61";
+ sha256 = "1ffjgx75wvpharzq60aqbpl78z1jwx13b21ifcadm1f976vdjq1q";
};
}
{
@@ -284,8 +293,8 @@
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
- rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39";
- sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4";
+ rev = "dae0fa8d5b0c810a8ab733fbd5510c7cae84eca4";
+ sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w";
};
}
{
@@ -293,8 +302,8 @@
fetch = {
type = "git";
url = "https://github.com/ulikunitz/xz";
- rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d";
- sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
+ rev = "6f934d456d51e742b4eeab20d925a827ef22320a";
+ sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831";
};
}
{
@@ -311,8 +320,17 @@
fetch = {
type = "git";
url = "https://github.com/valyala/quicktemplate";
- rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
- sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
+ rev = "d08324ac14fa81325830fae7eb30188ec68427f8";
+ sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx";
+ };
+ }
+ {
+ goPackagePath = "gitlab.com/nyarla/go-crypt";
+ fetch = {
+ type = "git";
+ url = "https://gitlab.com/nyarla/go-crypt.git";
+ rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1";
+ sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1";
};
}
{
@@ -320,8 +338,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447";
- sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
+ rev = "c2843e01d9a2bc60bb26ad24e09734fdc2d9ec58";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
@@ -329,8 +347,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
- sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
+ rev = "d8887717615a059821345a5c23649351b52a1c0b";
+ sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
};
}
{
@@ -338,8 +356,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695";
- sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw";
+ rev = "fead79001313d15903fb4605b4a1b781532cd93e";
+ sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i";
};
}
{
@@ -347,8 +365,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
- sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
+ rev = "5d731a35f4867878fc89f7744f7b6debb3beded6";
+ sha256 = "1ipmjki0i0dvpal1g0vgr8qc77kkvw3ka6yxlm0qzjk9j3579bsq";
};
}
{
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index 059a6b8f0aaa..8dd294bcdf84 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "airsonic-${version}";
- version = "10.1.2";
+ version = "10.2.1";
src = fetchurl {
url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
- sha256 = "0hpk801dipmzsswgx0y6m0xhwn5iz97agnb2bzbr5xhkl4a0d33k";
+ sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v";
};
buildCommand = ''
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index bda717b2afb1..d78fd6da00f1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "6.0.1";
+ version = "6.0.2";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0dh4yjcg0spv8g0xqxaljwix6yh98lnkd2fwv6rgw5w84j95h9br";
+ sha256 = "1qvkk83yhryvy73c56mp5vdlbrwz4ra5al3flah8s2m9dhbs89bi";
};
srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0kfi9v0w43nwci575xph3lxa96w8li50jsa1n9pjvz31cjs7hyy2";
+ sha256 = "1lvcd2i7jv7s4qrxc1p0ifsycdy0v0hzwgiz4kl2k3w21c50k69l";
};
postPatch = ''
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index f94d185910f9..9a4f96c46ba8 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
let
plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
plexpkg = if enablePlexPass then plexPass else {
- version = "1.14.1.5488";
- vsnHash = "cc260c476";
- sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40";
+ version = "1.15.2.793";
+ vsnHash = "782228f99";
+ sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7";
};
in stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
sha256 = plexpkg.sha256;
src = fetchurl {
- url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
+ url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
inherit sha256;
};
@@ -45,15 +45,12 @@ in stdenv.mkDerivation rec {
"Plex Transcoder" \
"Plex Tuner Service" ; do
patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
- patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
+ patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin"
done
find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \;
- # executables need libstdc++.so.6
- ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6"
-
# Our next problem is the "Resources" directory in /usr/lib/plexmediaserver.
# This is ostensibly a skeleton directory, which contains files that Plex
# copies into its folder in /var. Unfortunately, there are some SQLite
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 75aced300ed3..3dcb6605a61e 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -101,13 +101,13 @@ let
};
in stdenv.mkDerivation rec {
name = "rippled-${version}";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "ripple";
repo = "rippled";
rev = version;
- sha256 = "1zx8qs32v5ibkwm9nm6m0qh0gcr0vcigr2wbxpd40pqqk73cqb3q";
+ sha256 = "1lm0zzz0hi2sh2f4iqq3scapzdjbxcjgr700fgham9wqgaj2ash5";
};
hardeningDisable = ["format"];
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 2e68944c00d0..12253d740b7b 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]);
path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
- version = "2.3.7";
+ version = "2.3.8";
pname = "sabnzbd";
name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = version;
- sha256 = "08bk2ignm50ki2bqwwl0q9pia7v91cixr5b1yibz6qxsyfprk0mj";
+ sha256 = "1kdm2gv4mpdmyzfm9mfv26yxvjks8ii7c12hprp1zrmcindxg03g";
};
buildInputs = [ pythonEnv makeWrapper ];
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 44559885850f..b42a494ff106 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -60,7 +60,7 @@ let
(if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch)
(if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch)
./patches/specify_pkglibdir_at_runtime.patch
- ];
+ ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch;
installTargets = [ "install-world" ];
diff --git a/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch b/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch
new file mode 100644
index 000000000000..969f80ff8fc7
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch
@@ -0,0 +1,13 @@
+diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+index 743401cb96..be5c5f61d2 100644
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
+@@ -179,7 +179,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+
+ /*
+ * This is the default event source for Windows event log.
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 89de25008113..17cb8be739f6 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,11 @@
stdenv.mkDerivation rec {
name = "matomo-${version}";
- version = "3.8.1";
+ version = "3.9.1";
src = fetchurl {
- # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
- # url = "https://builds.matomo.org/${name}.tar.gz";
- url = "https://builds.matomo.org/piwik-${version}.tar.gz";
- sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0";
+ url = "https://builds.matomo.org/matomo-${version}.tar.gz";
+ sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 668dcabc0499..1df05099fbf5 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -95,13 +95,25 @@ stageFuns: let
__hatPackages = nextStage;
};
};
- in
- if args.__raw or false
- then args'
- else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
- buildPackages = if args.selfBuild or true then null else prevStage;
- targetPackages = if args.selfBuild or true then null else nextStage;
- });
+ thisStage =
+ if args.__raw or false
+ then args'
+ else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
+ adjacentPackages = if args.selfBuild or true then null else rec {
+ pkgsBuildBuild = prevStage.buildPackages;
+ pkgsBuildHost = prevStage;
+ pkgsBuildTarget =
+ if args.stdenv.targetPlatform == args.stdenv.hostPlatform
+ then pkgsBuildHost
+ else assert args.stdenv.hostPlatform == args.stdenv.buildPlatform; thisStage;
+ pkgsHostHost =
+ if args.stdenv.hostPlatform == args.stdenv.targetPlatform
+ then thisStage
+ else assert args.stdenv.buildPlatform == args.stdenv.hostPlatform; pkgsBuildHost;
+ pkgsTargetTarget = nextStage;
+ };
+ });
+ in thisStage;
# This is a hack for resolving cross-compiled compilers' run-time
# deps. (That is, compilers that are themselves cross-compiled, as
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 41f21abd44d6..46f2cb33bb06 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "ckbcomp-${version}";
- version = "1.190";
+ version = "1.191";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd";
+ sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index 59b0b4104cc0..897067774a9f 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
- version = "5.8.7";
+ version = "6.0.3";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
- rev = "${version}";
- sha256 = "1pwchmipswk5sld1l5p8mdiicb848glnh7r3s5x9qvijp5s57c5i";
+ rev = version;
+ sha256 = "1ma1d4h751qnxadfn42h29knq0rl1lgzraifx6ypidjph5i5a10l";
};
buildInputs = [
diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix
new file mode 100644
index 000000000000..043514ebb436
--- /dev/null
+++ b/pkgs/tools/X11/xtruss/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "xtruss";
+ version = "20181001.82973f5";
+
+ src = fetchurl {
+ url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz";
+ sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd";
+ };
+
+ meta = with stdenv.lib; {
+ description = "easy-to-use X protocol tracing program";
+ homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss;
+ license = licenses.mit;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index f611055a4341..4a0c244f07f7 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
+ makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
librsvg wrapGAppsHook
];
diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix
index fba85e0f5f00..262d3dd389eb 100644
--- a/pkgs/tools/audio/opl3bankeditor/default.nix
+++ b/pkgs/tools/audio/opl3bankeditor/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, qttools, alsaLib }:
stdenv.mkDerivation rec {
- version = "2019-01-12";
+ version = "1.5";
pname = "OPL3BankEditor";
src = fetchFromGitHub {
owner = "Wohlstand";
repo = pname;
- rev = "a254c923df5b385e140de6ae42cf4908af8728d3";
- sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw";
+ rev = "v${version}";
+ sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix
new file mode 100644
index 000000000000..d1b055f1d5f4
--- /dev/null
+++ b/pkgs/tools/audio/picotts/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
+
+stdenv.mkDerivation {
+ name = "picotts-unstable-2018-10-19";
+ src = fetchFromGitHub {
+ repo = "picotts";
+ owner = "naggety";
+ rev = "2f86050dc5da9ab68fc61510b594d8e6975c4d2d";
+ sha256 = "1k2mdv9llkh77jr4qr68yf0zgjqk87np35fgfmnc3rpdp538sccl";
+ };
+ nativeBuildInputs = [ autoconf automake ];
+ buildInputs = [ libtool popt ];
+ sourceRoot = "source/pico";
+ preConfigure = "./autogen.sh";
+ meta = {
+ description = "Text to speech voice sinthesizer from SVox.";
+ homepage = https://github.com/naggety/picotts;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [ stdenv.lib.maintainers.canndrew ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
+
+
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 759e2606e198..05d8a7177768 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
stdenv.mkDerivation rec {
- name = "bacula-9.4.1";
+ name = "bacula-9.4.2";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
- sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb";
+ sha256 = "1878jk541b8gvqbh15f0k3bvki1mx02q8mxnxhn9fdc1qk9083d4";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 6bdcad9a21a5..ea9ccdc36e1b 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.6.2";
+ version = "2.6.3";
name = "dar-${version}";
src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
- sha256 = "0bjrv6pxrzmb4d09yikl5wg6hz3llc30xl0ldzik4jzjrr8bcfpn";
+ sha256 = "00jlmbg80xam3xg1vvrbi5wl6cwij5bz8w80d4k0bmmk4rrwq4rc";
};
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 70bf187a2283..f13db4572e08 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bluez-alsa-${version}";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
- sha256 = "1rzcl65gipszsmlcg24gh1xkjkyk4929xhakn6y2smrgwv1zjqdh";
+ sha256 = "12kc2896rbir8viywd6bjwcklkwf46j4svh9viryn6kmk084nb49";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix
index e2b03e6f3822..8e55d24fc985 100644
--- a/pkgs/tools/compression/ncompress/default.nix
+++ b/pkgs/tools/compression/ncompress/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "ncompress-4.2.4.4";
+ name = "ncompress-4.2.4.5";
builder = ./builder.sh;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/project/ncompress/${name}.tar.gz";
- sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh";
+ sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm";
};
meta = {
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 4d71d501b3c1..816c09161dcf 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "s3fs-fuse-${version}";
- version = "1.84";
+ version = "1.85";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
- sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871";
+ sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m";
};
buildInputs = [ curl openssl libxml2 fuse ];
diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix
new file mode 100644
index 000000000000..5bb209984396
--- /dev/null
+++ b/pkgs/tools/graphics/blur-effect/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }:
+
+stdenv.mkDerivation rec {
+ pname = "blur-effect";
+ version = "1.1.3";
+
+ src = fetchFromGitHub {
+ owner = "sonald";
+ repo = pname;
+ rev = version;
+ sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ cmake
+ ];
+
+ buildInputs = [
+ gdk_pixbuf
+ libGL
+ mesa
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/sonald/blur-effect;
+ description = "Off-screen image blurring utility using OpenGL ES 3.0";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix
index 5a655b9ff162..883453379c4e 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/pkgs/tools/graphics/imgurbash2/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, bash, curl, xsel }:
stdenv.mkDerivation rec {
- name = "imgurbash2-${version}";
- version = "2.1";
+ pname = "imgurbash2";
+ version = "3.1";
src = fetchFromGitHub {
owner = "ram-on";
repo = "imgurbash2";
rev = version;
- sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk";
+ sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9";
};
installPhase = ''
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index 3115b1b72439..ffba2280e8a5 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
-, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
+, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings-desktop-schemas glib gnome3.gtk
+ gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
makeWrapper
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 0fdabfe35888..130019c1bc2a 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- version = "2.2.0";
- name = "oxipng-${version}";
+ version = "2.2.1";
+ pname = "oxipng";
src = fetchFromGitHub {
owner = "shssoichiro";
- repo = "oxipng";
+ repo = pname;
rev = "v${version}";
- sha256 = "00ys1dy8r1g84j04w50qcjas0qnfw4vphazvbfasd9q2b1p5z69l";
+ sha256 = "1r195x3wdkshjwy23fpqsyyrw7iaj7yb39nhcnx9d4nhgq8w0pcl";
};
- cargoSha256 = "125r3jmgwcq8qddm8hjpyzaam96kkifaxixksyaw2iqk9xq0nrpm";
+ cargoSha256 = "08mw937s61r4fj9bqrg492ss13zkik9557n9yk90r97a81972zbn";
# https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 7d5283b3133e..66efb936aa4c 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "vulkan-tools-${version}";
- version = "1.1.92";
+ version = "1.1.101.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
- sha256 = "1khbfxp2mha7h0vqs0fkqscxm76gn3zlia8yya11lkhk7sn3h0d3";
+ sha256 = "03227qxa8q19qgzk30h0h49sh03idr6vh9srnrhiziw2vzmahmpp";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix
new file mode 100644
index 000000000000..1e3da5dddecf
--- /dev/null
+++ b/pkgs/tools/graphics/xcur2png/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }:
+
+stdenv.mkDerivation rec {
+ pname = "xcur2png";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "eworm-de";
+ repo = pname;
+ rev = version;
+ sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ buildInputs = [
+ libpng
+ xorg.libX11
+ xorg.libXcursor
+ xorg.xorgproto
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/eworm-de/xcur2png/releases;
+ description = "Convert X cursors to PNG images";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index b8bf73fda648..518b88e6d02a 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,53 +1,35 @@
-{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
-, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
+{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl
+, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook
, enableVideo ? stdenv.isLinux
}:
let
inherit (python2Packages) pygtk python;
in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "zbar";
- version = "0.10";
- src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2";
- sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3";
+ version = "0.22";
+
+ src = fetchFromGitHub {
+ owner = "mchehab";
+ repo = "zbar";
+ rev = version;
+ sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq";
};
- patches = [
- (fetchpatch {
- name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
- url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch";
- sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69";
- })
- (fetchpatch {
- name = "python-zbar-import-fix-am.patch";
- url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch";
- sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx";
- })
- (fetchpatch {
- name = "new_autotools_build_fix.patch";
- url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch";
- sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3";
- })
- (fetchpatch {
- name = "threading-fix.patch";
- url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch";
- sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7";
- })
+ nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ];
+
+ buildInputs = [
+ imagemagickBig python pygtk perl libX11
+ ] ++ stdenv.lib.optionals enableVideo [
+ libv4l gtk2 qt5.qtbase qt5.qtx11extras
];
- buildInputs =
- [ imagemagickBig pkgconfig python pygtk perl libX11
- lzma autoreconfHook ] ++
- stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ];
-
- configureFlags = stdenv.lib.optionals (!enableVideo) [
+ configureFlags = [
+ "--with-dbusconfdir=$out/etc/dbus-1/system.d"
+ ] ++ stdenv.lib.optionals (!enableVideo) [
"--disable-video" "--without-gtk" "--without-qt"
];
- hardeningDisable = [ "fortify" ];
-
meta = with stdenv.lib; {
description = "Bar code reader";
longDescription = ''
@@ -57,15 +39,9 @@ in stdenv.mkDerivation rec {
EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
Code.
'';
- maintainers = with maintainers; [ raskin ];
+ maintainers = with maintainers; [ delroth raskin ];
platforms = platforms.unix;
license = licenses.lgpl21;
- homepage = http://zbar.sourceforge.net/;
- };
-
- passthru = {
- updateInfo = {
- downloadPage = "http://zbar.sourceforge.net/";
- };
+ homepage = https://github.com/mchehab/zbar;
};
}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index aab7563cb020..6d6c6d5d5769 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
name = "ibus-typing-booster-${version}";
- version = "2.5.3";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
- sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2";
+ sha256 = "1d32p9k9vp64rpmj2cs3552ak9jn54vyi2hqdpzag33v16cydsl4";
};
patches = [ ./hunspell-dirs.patch ];
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 655cbf3bc656..8c310310d43f 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, dpkg }:
stdenv.mkDerivation rec {
- name = "bdf2psf-${version}";
- version = "1.190";
+ pname = "bdf2psf";
+ version = "1.191";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "1dm1lwlnr3ikbl2nkmvj60n9qj5qa0g4dyszrv3qx88m2f6zq99w";
+ sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 99ba8e5e5159..fa7457b417e5 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null;
assert systemdSupport -> systemd != null;
stdenv.mkDerivation rec {
- name = "brltty-5.6";
+ name = "brltty-6.0";
src = fetchurl {
url = "http://brltty.com/archive/${name}.tar.gz";
- sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn";
+ sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg";
};
nativeBuildInputs = [ pkgconfig python3.pkgs.cython ];
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index aca449a4037b..a34dc0cdafe1 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "0.7.2";
+ version = "0.7.4";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- sha256 = "1hv9plgbwffdv94d8h6qlmazbwi56967wzqvfzr47iigbvx81vwj";
+ sha256 = "1qi29qy4kwqfbca5ghdmjidpwn2wghr19jwzrrk0xvlq1xb13jfa";
};
cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5";
diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
new file mode 100644
index 000000000000..00ab4cd75d0c
--- /dev/null
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
+
+
+stdenv.mkDerivation rec{
+ version = "1.0.1";
+ pname = "chafa";
+
+ src = fetchFromGitHub {
+ owner = "hpjansson";
+ repo = "chafa";
+ rev = version;
+ sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04";
+ };
+
+ nativeBuildInputs = [ autoconf
+ automake
+ libtool
+ pkgconfig
+ which
+ libxslt
+ libxml2
+ docbook_xml_dtd_412
+ docbook_xsl
+ ];
+
+ buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
+
+ patches = [ ./xmlcatalog_patch.patch ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ configureFlags = [ "--enable-man"
+ "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Terminal graphics for the 21st century.";
+ homepage = https://hpjansson.org/chafa/;
+ license = licenses.lgpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.mog ];
+ };
+}
diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/pkgs/tools/misc/chafa/xmlcatalog_patch.patch
new file mode 100644
index 000000000000..6bf988d6117f
--- /dev/null
+++ b/pkgs/tools/misc/chafa/xmlcatalog_patch.patch
@@ -0,0 +1,23 @@
+diff --git a/configure.ac b/configure.ac
+index 0055a70..fd4a905 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,18 +111,6 @@ AS_IF([ test "$enable_man" != no ], [
+ ])
+ ])
+
+-AS_IF([test "$enable_man" != no], [
+- dnl check for DocBook XSL stylesheets in the local catalog
+- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+- [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
+- AS_IF([ test "$have_docbook_style" != yes ], [
+- AS_IF([ test "$enable_man" = yes ], [
+- AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
+- ])
+- enable_man=no
+- ])
+-])
+-
+ AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+
+ AC_MSG_CHECKING([whether to generate man pages])
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index e89f93a4a821..0719fb36164b 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
"-Dlibcolordcompat=true"
"-Dsane=true"
"-Dvapi=true"
+ "-Ddaemon_user=colord"
];
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index e33376243bd6..05a312bb8bca 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoreconfHook, tzdata }:
stdenv.mkDerivation rec {
- version = "0.4.5";
+ version = "0.4.6";
name = "dateutils-${version}";
src = fetchurl {
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
- sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn";
+ sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index de8130ff3f1f..4a56e6465e62 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
name = "direnv-${version}";
- version = "2.19.2";
+ version = "2.20.0";
goPackagePath = "github.com/direnv/direnv";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "1iq9wmc63x1c7g1ixdhd6q3w1sx8xl8kf1bprxwq26n9zpd0g13g";
+ sha256 = "0ds8abwasymbsn9vak2105gczfgka4mz1i6kf1lvc3zm27v55cij";
};
postConfigure = ''
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 326192ff5bd1..0ba3472ae702 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -11,16 +11,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ffsend-${version}";
- version = "0.2.38";
+ version = "0.2.39";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "1kxxcqyilbhzcsnddlf7ha3dd57qj82yvbb9jsssimnlcskx84hx";
+ sha256 = "0109g2h8673q6kx1lbci59zg9iczj676fvbip3sf1xfypvca22j9";
};
- cargoSha256 = "1qxvm2pz01na6nijdn0hlv5hxshiz3pfy6km7n9hjyakwi684a0l";
+ cargoSha256 = "0yf9zfilj2whhnmbvh8p8vz4gkd8ds21gshylwp4ykqwv5p59nqq";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 21a126b04f3b..b45df3f57b56 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
-let version = "1.0"; in
stdenv.mkDerivation rec {
name = "flashrom-${version}";
+ version = "1.0.1";
src = fetchurl {
- url = "https://download.flashrom.org/releases/${name}.tar.bz2";
- sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb";
+ url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
+ sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm";
};
# Newer versions of libusb deprecate some API flashrom uses.
- postPatch = ''
- substituteInPlace Makefile \
- --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
- '';
+ #postPatch = ''
+ # substituteInPlace Makefile \
+ # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
+ #'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libftdi pciutils ];
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index c7ae194e426b..139863d36ecb 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -1,42 +1,42 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.2.0)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.5.2)
+ addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorize (0.8.1)
- concurrent-ruby (1.0.5)
- ethon (0.11.0)
+ concurrent-ruby (1.1.5)
+ ethon (0.12.0)
ffi (>= 1.3.0)
- ffi (1.9.23)
- html-proofer (3.8.0)
+ ffi (1.10.0)
+ html-proofer (3.10.2)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colorize (~> 0.8)
mercenary (~> 0.3.2)
- nokogiri (~> 1.8.1)
+ nokogiri (~> 1.9)
parallel (~> 1.3)
typhoeus (~> 1.3)
yell (~> 2.0)
- i18n (1.0.1)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
mercenary (0.3.6)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
- nokogiri (1.8.2)
- mini_portile2 (~> 2.3.0)
- parallel (1.12.1)
- public_suffix (3.0.2)
+ nokogiri (1.10.2)
+ mini_portile2 (~> 2.4.0)
+ parallel (1.17.0)
+ public_suffix (3.0.3)
thread_safe (0.3.6)
- typhoeus (1.3.0)
+ typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- yell (2.0.7)
+ yell (2.1.0)
PLATFORMS
ruby
@@ -45,4 +45,4 @@ DEPENDENCIES
html-proofer
BUNDLED WITH
- 1.14.6
+ 1.17.2
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index 7043c9e355b0..6a6e62b726ed 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -1,23 +1,29 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
+ sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
type = "gem";
};
- version = "5.2.0";
+ version = "5.2.3";
};
addressable = {
dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
- version = "2.5.2";
+ version = "2.6.0";
};
colorize = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -26,49 +32,61 @@
version = "0.8.1";
};
concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
- version = "1.0.5";
+ version = "1.1.5";
};
ethon = {
dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
+ sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
type = "gem";
};
- version = "0.11.0";
+ version = "0.12.0";
};
ffi = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
- version = "1.9.23";
+ version = "1.10.0";
};
html-proofer = {
dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
+ sha256 = "0qwy5cdl5l6rl9cqpcydl4126rwv1f4l9ixf3z6j2rdy979l2jaf";
type = "gem";
};
- version = "3.8.0";
+ version = "3.10.2";
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.0.1";
+ version = "1.6.0";
};
mercenary = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
@@ -77,14 +95,18 @@
version = "0.3.6";
};
mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
@@ -94,30 +116,38 @@
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+ sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
- version = "1.8.2";
+ version = "1.10.2";
};
parallel = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+ sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
type = "gem";
};
- version = "1.12.1";
+ version = "1.17.0";
};
public_suffix = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.3";
};
thread_safe = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -127,15 +157,19 @@
};
typhoeus = {
dependencies = ["ethon"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
+ sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
type = "gem";
};
- version = "1.3.0";
+ version = "1.3.1";
};
tzinfo = {
dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
@@ -144,11 +178,13 @@
version = "1.2.5";
};
yell = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
+ sha256 = "161kfwyv7aq983m2gd90c67sqcs0p1z6nhjall2mdr7iz0gqf9wn";
type = "gem";
};
- version = "2.0.7";
+ version = "2.1.0";
};
}
\ No newline at end of file
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 4a50f7200bbb..04271b610699 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ms-sys-${version}";
- version = "2.5.3";
+ version = "2.6.0";
src = fetchurl {
url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
- sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0";
+ sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
};
nativeBuildInputs = [ gettext ];
diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix
new file mode 100644
index 000000000000..521bebf47a3b
--- /dev/null
+++ b/pkgs/tools/misc/paps/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub
+, autoconf, automake, pkgconfig, pango }:
+
+stdenv.mkDerivation rec {
+ pname = "paps";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "dov";
+ repo = pname;
+ rev = version;
+ sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkgconfig ];
+ buildInputs = [ pango ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Pango to PostScript converter";
+ homepage = https://github.com/dov/paps;
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ etu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 04151812a078..77331a7f025a 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -3,12 +3,12 @@
let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
- name = "qt5ct-${version}";
- version = "0.37";
+ pname = "qt5ct";
+ version = "0.38";
src = fetchurl {
- url = "mirror://sourceforge/qt5ct/${name}.tar.bz2";
- sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
+ sha256 = "0p0317z79h906qwaf0p8ga6lmr1dlabkx12gn31bv9lnp9f55jwg";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index c7d3d8219902..696074e2e889 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "skim";
- version = "0.6.2";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "lotabout";
repo = pname;
rev = "v${version}";
- sha256 = "06d2mh60qzm62gn06m1b4pvn9wq2jcna2prgzl69alb6fsfdyp7z";
+ sha256 = "0ywrqfxxqv7mpm4szw8n3hcvc4jn9a490j9s7qh3vzqgrsx2sxk3";
};
outputs = [ "out" "vim" ];
- cargoSha256 = "0jypd49cha6fy8dwji7xqp2vsi2as20lk4zymx8z4ifqj0s2qjyb";
+ cargoSha256 = "0vxyi7f5p9blv1isngvad8jrgpwmmv3dkr39qsb2i217jx3mzj2i";
patchPhase = ''
sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -D -m 555 bin/sk-tmux -t $out/bin
- install -D -m 644 shell/skim.1 $out/man/man1/skim.1
+ install -D -m 644 man/man1/* -t $out/man/man1
install -D -m 444 shell/* -t $out/share/skim
install -D -m 444 plugin/skim.vim -t $vim/plugin
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 87fda19a75fe..cc37326cc5eb 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "snapper-${version}";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
- sha256 = "0f3xvvmyln7rjvv4w0zsd4b4d1mzcdx0xrgcscqj2v18xgwwcc4p";
+ sha256 = "0f3nsqk8820jh08qdh23n01vxbigsfcn9s5qvgqz6jf4pwin6j0x";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index d82c7dda96a4..53a0e0a2992b 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "ttyplot-${version}";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "tenox7";
repo = "ttyplot";
rev = version;
- sha256 = "0icv40fmf8z3a00csjh4c4svq3y6s6j70jgxjd6zqlxyks9wj7mr";
+ sha256 = "1xaqzm71w2n0q532wpa3w818mvjvch3h34m2aq7pldkyk09frjxh";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
new file mode 100644
index 000000000000..e9733c7ef799
--- /dev/null
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, fetchFromGitHub
+, coreutils
+, sharutils
+, version
+, sha256
+}:
+
+stdenv.mkDerivation rec {
+ inherit version;
+ name = "vimpager-${version}";
+
+ src = fetchFromGitHub {
+ inherit sha256;
+
+ owner = "rkitover";
+ repo = "vimpager";
+ rev = "${version}";
+ };
+
+ buildInputs = [ coreutils sharutils ]; # for uuencode
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ buildPhase = ''
+ sed -i 's,/bin/cat,${coreutils}/bin/cat,g' vimpager
+ make
+ '';
+
+
+ meta = with stdenv.lib; {
+ description = "Use Vim as PAGER";
+ homepage = "https://www.vim.org/scripts/script.php?script_id = 1723";
+ license = with licenses; [ bsd2 mit vim ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/misc/vimpager/default.nix b/pkgs/tools/misc/vimpager/default.nix
new file mode 100644
index 000000000000..1b1512db3cfe
--- /dev/null
+++ b/pkgs/tools/misc/vimpager/default.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./build.nix {
+ version = "2.06";
+ sha256 = "05yr7j72bw64nx7a0y6w9fjmz54zd4g46fn1qjfbbqvbc19fjpl8";
+}
diff --git a/pkgs/tools/misc/vimpager/latest.nix b/pkgs/tools/misc/vimpager/latest.nix
new file mode 100644
index 000000000000..c98b9a000147
--- /dev/null
+++ b/pkgs/tools/misc/vimpager/latest.nix
@@ -0,0 +1,7 @@
+{ callPackage }:
+
+callPackage ./build.nix {
+ version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5";
+ sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg";
+}
+
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index 2e91c5c3b63a..dc0280846854 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform
+{ stdenv, fetchFromGitHub, rustPlatform, Security
}:
rustPlatform.buildRustPackage rec {
@@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0vkb3jmyb3zg3xiig5vlxhh74m27rvqbkgrwdqzprifn9vcj17ir";
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
meta = with stdenv.lib; {
description = "Command-line client for WebSockets (like netcat/socat)";
homepage = https://github.com/vi/websocat;
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index f14825968576..b5bb97ce5724 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2019.03.01";
+ version = "2019.04.01";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf";
+ sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index a123e551a90a..3ff06960156a 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -2,14 +2,19 @@
stdenv.mkDerivation rec {
name = "autossh-1.4g";
-
+
src = fetchurl {
url = "http://www.harding.motd.ca/autossh/${name}.tgz";
sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
};
-
- buildInputs = [ openssh ];
-
+
+ preConfigure = ''
+ export ac_cv_func_malloc_0_nonnull=yes
+ export ac_cv_func_realloc_0_nonnull=yes
+ '';
+
+ nativeBuildInputs = [ openssh ];
+
installPhase =
''
install -D -m755 autossh $out/bin/autossh || return 1
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
'';
-
+
meta = with stdenv.lib; {
homepage = http://www.harding.motd.ca/autossh/;
description = "Automatically restart SSH sessions and tunnels";
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index b165142d85a4..45ff2947c685 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput bin/curl-config "$dev"
+ '' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 75e2b45110fe..f9df781715ac 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, which }:
stdenv.mkDerivation rec {
- name = "nbd-3.18";
+ name = "nbd-3.19";
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
- sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq";
+ sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml";
};
buildInputs = [ glib ]
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 4dbc455103c5..43018e401f1e 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "ndisc6-1.0.3";
+ name = "ndisc6-1.0.4";
src = fetchurl {
url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
- sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g";
+ sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index 5fc591f0a43d..352b88f39354 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -1,17 +1,18 @@
{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
+, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3, networkmanagerapplet }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-l2tp";
- version = "1.2.10";
+ version = "1.2.12";
src = fetchFromGitHub {
owner = "nm-l2tp";
repo = "network-manager-l2tp";
rev = "${version}";
- sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x";
+ sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
};
patches = [
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
- nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ];
preConfigure = ''
intltoolize -f
diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
index 0a068ee800c6..531672c39362 100644
--- a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
+++ b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
@@ -1,6 +1,8 @@
---- a/src/nm-l2tp-service.c
-+++ b/src/nm-l2tp-service.c
-@@ -480,7 +480,7 @@
+diff --git a/shared/utils.c b/shared/utils.c
+index c978a1f..d2c36cd 100644
+--- a/shared/utils.c
++++ b/shared/utils.c
+@@ -52,7 +52,7 @@ nm_find_ipsec (void)
{
static const char *ipsec_binary_paths[] =
{
@@ -9,7 +11,7 @@
"/usr/sbin/ipsec",
"/usr/local/sbin/ipsec",
"/sbin/strongswan",
-@@ -505,7 +505,7 @@
+@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
{
static const char *l2tp_binary_paths[] =
{
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index d7f558574065..17460bc72f70 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
-, gnome3, libsecret }:
+, gtk3, gnome3, libsecret }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
};
- buildInputs = [ networkmanager strongswanNM libsecret ]
- ++ (with gnome3; [ gtk networkmanagerapplet ]);
+ buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 358c53f453bb..44bbb3779d04 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "openvpn-${version}";
- version = "2.4.6";
+ version = "2.4.7";
src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
- sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
+ sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 6d4c77d51987..3e9d1f9f5f7e 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication rec {
service-identity pyyaml magic-wormhole treq
];
- checkInputs = with pythonPackages; [ hypothesis ];
+ checkInputs = with pythonPackages; [ hypothesis twisted ];
# Install the documentation.
postInstall = ''
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 6779d864ce24..41c39cd27c26 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
- libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
+ libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
}:
stdenv.mkDerivation rec {
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
intltool
wrapGAppsHook
];
-
+
buildInputs = [
openssl
curl
libnotify
libappindicator-gtk3
- gnome3.gtk
+ gtk3
(stdenv.lib.getLib gnome3.dconf)
]
++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 6b944ee3ffc4..d13dd8517fe9 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
stdenv.mkDerivation rec {
- version = "5.4.1";
+ version = "5.4.2";
name = "whois-${version}";
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
- sha256 = "01pfil456q3241awilszx5iq1x6kr1rddkraj8yyxyab45l2ssk9";
+ sha256 = "17i9620gm100plza0qdzfx9nvkvgyb6jcc5g412y5r7wvh7q19mh";
};
nativeBuildInputs = [ perl gettext pkgconfig ];
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix
index 2c389c144b1e..b4b339edb5f7 100644
--- a/pkgs/tools/package-management/appimagekit/default.nix
+++ b/pkgs/tools/package-management/appimagekit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
-, pkgconfig, cmake, autoconf, automake, libtool
-, wget, xxd, desktop-file-utils
-, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive
+, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper
+, wget, xxd, desktop-file-utils, file
+, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive
, squashfsTools
, gtest
}:
@@ -72,9 +72,13 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib zlib cairo openssl fuse
xz inotify-tools libarchive
- squashfsTools
+ squashfsTools makeWrapper
];
+ postPatch = ''
+ substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file"
+ '';
+
preConfigure = ''
export HOME=$(pwd)
'';
@@ -90,6 +94,14 @@ in stdenv.mkDerivation rec {
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
];
+ postInstall = ''
+ cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/"
+ cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin"
+
+ wrapProgram "$out/bin/appimagetool" \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}"
+ '';
+
checkInputs = [ gtest ];
doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix
new file mode 100644
index 000000000000..c5844702ef38
--- /dev/null
+++ b/pkgs/tools/security/afl/libdislocator.nix
@@ -0,0 +1,34 @@
+{ stdenv, afl}:
+
+stdenv.mkDerivation rec {
+ version = (builtins.parseDrvName afl.name).version;
+ name = "libdislocator-${version}";
+
+ src = afl.src;
+ sourceRoot = "${afl.name}/libdislocator";
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ preInstall = ''
+ mkdir -p $out/lib/afl
+ '';
+ postInstall = ''
+ mkdir $out/bin
+ cat > $out/bin/get-libdislocator-so < chrome-host.json
+ sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json
+
+ install chrome-host.json $bin/etc/
+ install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json
+ install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Chrome & Firefox extension for zx2c4's pass";
+ homepage = https://github.com/dannyvankooten/browserpass;
+ license = licenses.mit;
+ platforms = with platforms; linux ++ darwin ++ openbsd;
+ maintainers = with maintainers; [ rvolosatovs ];
+ };
+}
diff --git a/pkgs/tools/security/browserpass/2deps.nix b/pkgs/tools/security/browserpass/2deps.nix
new file mode 100644
index 000000000000..631463a69d11
--- /dev/null
+++ b/pkgs/tools/security/browserpass/2deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/gokyle/twofactor";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gokyle/twofactor";
+ rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7";
+ sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-zglob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-zglob";
+ rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
+ sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
+ };
+ }
+ {
+ goPackagePath = "github.com/sahilm/fuzzy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sahilm/fuzzy";
+ rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
+ sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
+ };
+ }
+ {
+ goPackagePath = "rsc.io/qr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rsc/qr";
+ rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5";
+ sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p";
+ };
+ }
+]
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index dd797fb9348f..c1c9e679f22c 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -1,43 +1,65 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }:
-
-buildGoPackage rec {
- name = "browserpass-${version}";
- version = "2.0.22";
-
- goPackagePath = "github.com/dannyvankooten/browserpass";
-
- goDeps = ./deps.nix;
+{ lib, callPackage, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg }:
+let
+ # For backwards compatibility with v2 of the browser extension, we embed v2
+ # of the native host in v3. Because the extension will auto-update when it
+ # is released, this code can be removed from that point on.
+ # Don't forget to remove v2 references down below and the v2 files in this
+ # folder
+ v2 = callPackage ./2.nix {};
+in buildGoPackage rec {
+ pname = "browserpass";
+ version = "3.0.1";
src = fetchFromGitHub {
- repo = "browserpass";
- owner = "dannyvankooten";
+ owner = "browserpass";
+ repo = "browserpass-native";
rev = version;
- sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx";
+ sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx";
};
+ nativeBuildInputs = [ makeWrapper ];
+
+ goPackagePath = "github.com/browserpass/browserpass-native";
+ goDeps = ./deps.nix;
+
postPatch = ''
- substituteInPlace browserpass.go \
- --replace /usr/local/bin/gpg ${gnupg}/bin/gpg
+ # Because this Makefile will be installed to be used by the user, patch
+ # variables to be valid by default
+ substituteInPlace Makefile \
+ --replace "PREFIX ?= /usr" ""
'';
- postInstall = ''
- host_file="$bin/bin/browserpass"
- mkdir -p "$bin/etc"
+ DESTDIR = placeholder "bin";
- sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json
- sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json
-
- install chrome-host.json $bin/etc/
- install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json
- install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json
+ postConfigure = ''
+ cd "go/src/$goPackagePath"
+ make configure
'';
- meta = with stdenv.lib; {
- description = "A Chrome & Firefox extension for zx2c4's pass";
- homepage = https://github.com/dannyvankooten/browserpass;
- license = licenses.mit;
- platforms = with platforms; linux ++ darwin ++ openbsd;
- maintainers = with maintainers; [ rvolosatovs ];
+ buildPhase = ''
+ make
+ '';
+
+ installPhase = ''
+ make install
+
+ wrapProgram $bin/bin/browserpass \
+ --suffix PATH : ${lib.makeBinPath [ gnupg ]}
+
+ # This path is used by our firefox wrapper for finding native messaging hosts
+ mkdir -p $bin/lib/mozilla/native-messaging-hosts
+ ln -s $bin/lib/browserpass/hosts/firefox/*.json $bin/lib/mozilla/native-messaging-hosts
+
+ # These can be removed too, see comment up top
+ ln -s ${lib.getBin v2}/etc $bin/etc
+ ln -s ${lib.getBin v2}/lib/mozilla/native-messaging-hosts/* $bin/lib/mozilla/native-messaging-hosts
+ '';
+
+ meta = with lib; {
+ description = "Browserpass native client app";
+ homepage = https://github.com/browserpass/browserpass-native;
+ license = licenses.isc;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ rvolosatovs infinisil ];
};
}
diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix
index 631463a69d11..334a189ad404 100644
--- a/pkgs/tools/security/browserpass/deps.nix
+++ b/pkgs/tools/security/browserpass/deps.nix
@@ -1,12 +1,21 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
- goPackagePath = "github.com/gokyle/twofactor";
+ goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
- url = "https://github.com/gokyle/twofactor";
- rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7";
- sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.2";
+ sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
};
}
{
@@ -14,26 +23,71 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
- rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
- sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
+ rev = "v0.0.1";
+ sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
};
}
{
- goPackagePath = "github.com/sahilm/fuzzy";
+ goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
- url = "https://github.com/sahilm/fuzzy";
- rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
- sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
- goPackagePath = "rsc.io/qr";
+ goPackagePath = "github.com/rifflock/lfshook";
fetch = {
type = "git";
- url = "https://github.com/rsc/qr";
- rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5";
- sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p";
+ url = "https://github.com/rifflock/lfshook";
+ rev = "b9218ef580f5";
+ sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.4.0";
+ sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "fead79001313";
+ sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i";
};
}
]
diff --git a/pkgs/tools/security/bundler-audit/Gemfile b/pkgs/tools/security/bundler-audit/Gemfile
new file mode 100644
index 000000000000..f9fb0e329bd4
--- /dev/null
+++ b/pkgs/tools/security/bundler-audit/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'bundler-audit'
diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock
new file mode 100644
index 000000000000..28cbcf5a9a66
--- /dev/null
+++ b/pkgs/tools/security/bundler-audit/Gemfile.lock
@@ -0,0 +1,16 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ bundler-audit (0.6.1)
+ bundler (>= 1.2.0, < 3)
+ thor (~> 0.18)
+ thor (0.20.3)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bundler-audit
+
+BUNDLED WITH
+ 1.14.6
diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix
new file mode 100644
index 000000000000..8b19b6103d4a
--- /dev/null
+++ b/pkgs/tools/security/bundler-audit/default.nix
@@ -0,0 +1,26 @@
+{ bundlerEnv, ruby, lib }:
+
+bundlerEnv rec {
+ name = "${pname}-${version}";
+ pname = "bundler-audit";
+ version = (import ./gemset.nix).bundler-audit.version;
+
+ inherit ruby;
+ gemdir = ./.;
+
+ meta = with lib; {
+ description = "Patch-level verification for Bundler";
+ longDescription = ''
+ Features:
+ - Checks for vulnerable versions of gems in Gemfile.lock.
+ - Checks for insecure gem sources (http://).
+ - Allows ignoring certain advisories that have been manually worked around.
+ - Prints advisory information.
+ - Does not require a network connection.
+ '';
+ homepage = https://github.com/rubysec/bundler-audit;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ primeos ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix
new file mode 100644
index 000000000000..56d78b3e8f16
--- /dev/null
+++ b/pkgs/tools/security/bundler-audit/gemset.nix
@@ -0,0 +1,19 @@
+{
+ bundler-audit = {
+ dependencies = ["thor"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
+ type = "gem";
+ };
+ version = "0.6.1";
+ };
+ thor = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ type = "gem";
+ };
+ version = "0.20.3";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 8e641ba4a0ed..4d9beb654ece 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "clamav-${version}";
- version = "0.101.1";
+ version = "0.101.2";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
- sha256 = "01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps";
+ sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha";
};
# don't install sample config files into the absolute sysconfdir folder
diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix
new file mode 100644
index 000000000000..c5987d37889c
--- /dev/null
+++ b/pkgs/tools/security/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs }:
+
+stdenv.mkDerivation rec {
+ version = "0.0.1";
+ name = "ecdsatool-${version}";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "kaniini";
+ repo = "ecdsatool";
+ rev = "7c0b2c51e2e64d1986ab1dc2c57c2d895cc00ed1";
+ sha256 = "08z9309znkhrjpwqd4ygvm7cd1ha1qbrnlzw64fr8704jrmx762k";
+ };
+
+ configurePhase = ''
+ ./autogen.sh
+ ./configure --prefix=$out
+ '';
+
+ nativeBuildInputs = with pkgs; [openssl autoconf automake];
+ buildInputs = with pkgs; [libuecc];
+
+ meta = with stdenv.lib; {
+ description = "Create and manipulate ECC NISTP256 keypairs.";
+ homepage = https://github.com/kaniini/ecdsatool/;
+ license = with licenses; [free];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 9fb5e45a8edb..fbb370027d7e 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -1,5 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
+{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
+, buildPackages
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
@@ -15,13 +16,14 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
- version = "2.2.14";
+ version = "2.2.15";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
- sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
+ sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b";
};
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libgcrypt libassuan libksba libiconv npth gettext texinfo
@@ -36,7 +38,13 @@ stdenv.mkDerivation rec {
''; #" fix Emacs syntax highlighting :-(
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
- configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
+ configureFlags = [
+ "--with-libgpg-error-prefix=${libgpgerror.dev}"
+ "--with-libgcrypt-prefix=${libgcrypt.dev}"
+ "--with-libassuan-prefix=${libassuan.dev}"
+ "--with-ksba-prefix=${libksba.dev}"
+ "--with-npth-prefix=${npth}"
+ ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
postInstall = ''
mkdir -p $out/lib/systemd/user
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 4db350684bef..0415b10b25d8 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -2,15 +2,14 @@
, bash-completion, openssl, curl, libxml2, libxslt }:
stdenv.mkDerivation rec {
- name = "lastpass-cli-${version}";
-
- version = "1.3.1";
+ pname = "lastpass-cli";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "lastpass";
- repo = "lastpass-cli";
+ repo = pname;
rev = "v${version}";
- sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
+ sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq";
};
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
@@ -21,11 +20,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- cmakeFlags = [
- "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions"
- ];
+ installTargets = [ "install" "install-doc" ];
- installTargets = "install install-doc";
+ postInstall = ''
+ install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass
+ install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish
+ '';
meta = with lib; {
description = "Stores, retrieves, generates, and synchronizes passwords securely";
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index c72f75e24e27..ceff23911c7e 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "2.7.1";
+ version = "2.7.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CISOfy";
repo = "${pname}";
rev = "${version}";
- sha256 = "1nv2dqd2k2n8mcdr6xl5g713xxkgvja6487by1wn4k0b416jij9i";
+ sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 09f8c63973c7..6ec90cd15a85 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
name = "modsecurity-${version}";
- version = "2.9.2";
+ version = "2.9.3";
src = fetchurl {
url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
- sha256 = "41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5";
+ sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 007ffdf3e3fa..8ddbd60a38d1 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -73,6 +73,9 @@ let
# Link extensions env
rmdir $out/lib/password-store/extensions
ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/.
+ for f in ${extensionsEnv}/share/man/man1/*.1.gz; do
+ ln -s $f $out/share/man/man1/
+ done
# Fix program name in --help
substituteInPlace $out/bin/pass \
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 0484e8e069ab..d3a8f35d9148 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sslscan-${version}";
- version = "1.11.12";
+ version = "1.11.13";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "${version}-rbsec";
- sha256 = "0wa0z6my6aqjp8si6x522ivk0yy55izbs3ch298gxjw5r15f4jb1";
+ sha256 = "0sa8iw91wi3515lw761j84wagab1x9rxr0mn8m08qj300z2044yk";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix
new file mode 100644
index 000000000000..dc2cfe81746a
--- /dev/null
+++ b/pkgs/tools/security/zzuf/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "zzuf";
+ version = "0.15";
+
+ src = fetchFromGitHub {
+ owner = "samhocevar";
+ repo = "zzuf";
+ rev = "v${version}";
+ sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9";
+ };
+
+ buildInputs = [ autoconf automake libtool pkgconfig ];
+
+ preConfigure = "./bootstrap";
+
+ meta = with stdenv.lib; {
+ description = "Transparent application input fuzzer.";
+ homepage = http://caca.zoy.org/wiki/zzuf;
+ license = licenses.wtfpl;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ lihop ];
+ };
+}
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 6a4a09f4790a..4b0150735e8f 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "hwinfo-${version}";
- version = "21.63";
+ version = "21.64";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = "${version}";
- sha256 = "0rwc30vs7clhl0kmniw4vms1ngx3xl6l1a979hywszvzhgmdclxh";
+ sha256 = "0jdwd6xvcsyyk03hv0kyz6pn4nzmgn2ynj8gqai1fxh3l8hv48w8";
};
patchPhase = ''
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index d69398e64f14..17680de86f0d 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "inxi-${version}";
- version = "3.0.32-1";
+ version = "3.0.33-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv";
+ sha256 = "19bfdid4zp39irsdq3m6yyqf2336c30da35qgslrzcr2vh815g8c";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 25a9660aed90..4ec34a68122c 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "logcheck-${version}";
- version = "1.3.19";
+ version = "1.3.20";
_name = "logcheck_${version}";
src = fetchurl {
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
- sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86";
+ sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz";
};
prePatch = ''
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 362545285ede..282729f31459 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "monit-5.25.2";
+ name = "monit-5.25.3";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
- sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a";
+ sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1";
};
nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 7283819f14bf..c906d430d8f6 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "3.19.1";
+ version = "3.20.1";
src = fetchurl {
url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
- sha256 = "0y2ixmbl4af4yf0a56pmg1c00nh0yvlfwr9ck9nhxbdysylk3yaw";
+ sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56";
};
nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 53d8cf8a8a24..a5864fbc051c 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -1,20 +1,46 @@
-{ stdenv, fetchurl, wxGTK29, boost }:
+{ stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30,
+ boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml,
+ nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "poedit-1.5.7";
+ name = "poedit-${version}";
+ version = "2.2.1";
src = fetchurl {
- url = "mirror://sourceforge/poedit/${name}.tar.gz";
- sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4";
+ url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
+ sha256 = "0brj6ysisxng2xn8l9ii2rngsj5b4rk27hzfjbp3zwb2caagd3vq";
};
- buildInputs = [ wxGTK29 boost ];
+ nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
+ libxslt xmlto boost libtool pkgconfig ];
+
+ buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
+
+ propagatedBuildInputs = [ gettext ];
+
+ preConfigure = "
+ patchShebangs bootstrap
+ ./bootstrap
+ ";
+
+ configureFlags = [
+ "--without-cld2"
+ "--without-cpprest"
+ "--with-boost-libdir=${boost.out}/lib"
+ "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
+ ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
+ '';
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Cross-platform gettext catalogs (.po files) editor";
- homepage = http://www.poedit.net/;
+ homepage = https://www.poedit.net/;
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ domenkozar genesis ];
};
}
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix
new file mode 100644
index 000000000000..31184e11399b
--- /dev/null
+++ b/pkgs/tools/typesetting/pdfsandwich/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }:
+
+stdenv.mkDerivation rec {
+ version = "0.1.7";
+ pname = "pdfsandwich";
+
+ src = fetchsvn {
+ url = "svn://svn.code.sf.net/p/pdfsandwich/code/trunk/src";
+ rev = "75";
+ sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6";
+ };
+
+ buildInputs = [ ocaml perl makeWrapper];
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -p pdfsandwich $out/bin
+ wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]}
+
+ mkdir -p $out/man/man1
+ cp -p pdfsandwich.1.gz $out/man/man1
+ '';
+
+meta = with stdenv.lib; {
+ description = "OCR tool for scanned PDFs";
+ homepage = http://www.tobias-elze.de/pdfsandwich/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.rps ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 7a06689c5e66..1a0a9b877bfe 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -87,7 +87,8 @@ in buildEnv {
export TEXMFSYSVAR="$out/share/texmf-var"
export PERL5LIB="$out/share/texmf/scripts/texlive"
'' +
- # patch texmf-{dist,local} -> texmf to be sure
+ # patch texmf-dist -> $out/share/texmf
+ # patch texmf-local -> $out/share/texmf-local
# TODO: perhaps do lua actions?
# tried inspiration from install-tl, sub do_texmf_cnf
''
@@ -99,8 +100,7 @@ in buildEnv {
rm ./texmfcnf.lua
sed \
-e 's,texmf-dist,texmf,g' \
- -e 's,texmf-local,texmf,g' \
- -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf\",g" \
+ -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,selfautodir:/,$out/share/,g" \
-e "s,selfautodir:,$out/share/,g" \
@@ -116,7 +116,6 @@ in buildEnv {
rm ./texmf.cnf
sed \
-e 's,texmf-dist,texmf,g' \
- -e 's,texmf-local,texmf,g' \
-e "s,\$SELFAUTOLOC,$out,g" \
-e "s,\$SELFAUTODIR,$out/share,g" \
-e "s,\$SELFAUTOPARENT,$out/share,g" \
@@ -126,6 +125,8 @@ in buildEnv {
patchCnfLua "./texmfcnf.lua"
+ mkdir $out/share/texmf-local
+
rm updmap.cfg
)
'' +
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
new file mode 100644
index 000000000000..590e5704b88d
--- /dev/null
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "rootlesskit-${version}";
+ version = "0.3.0-alpha.2";
+ goPackagePath = "github.com/rootless-containers/rootlesskit";
+
+ src = fetchFromGitHub {
+ owner = "rootless-containers";
+ repo = "rootlesskit";
+ rev = "v${version}";
+ sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6";
+ };
+
+ meta = with lib; {
+ homepage = https://github.com/rootless-containers/rootlesskit;
+ description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user'';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ offline ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 96396acb9e62..fac60ece8108 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -49,11 +49,6 @@ mapAliases ({
bashCompletion = bash-completion; # Added 2016-09-28
bridge_utils = bridge-utils; # added 2015-02-20
btrfsProgs = btrfs-progs; # added 2016-01-03
- buildbot = pythonPackages.buildbot; # added 2018-10-11
- buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11
- buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11
- buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11
- buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb29fd21243d..1dfe98d71b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25,9 +25,6 @@ let
in
{
- # Allow callPackage to fill in the pkgs argument
- inherit pkgs;
-
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
# it uses GCC compiled with multilib support; on i686-linux, it's
# just the plain stdenv.
@@ -259,6 +256,7 @@ in
curl = buildPackages.curl.override rec {
# break dependency cycles
fetchurl = stdenv.fetchurlBoot;
+ zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
@@ -268,7 +266,7 @@ in
};
libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot;
- inherit openssl;
+ inherit zlib openssl;
};
# On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles.
@@ -280,7 +278,7 @@ in
};
nghttp2 = buildPackages.nghttp2.override {
fetchurl = stdenv.fetchurlBoot;
- inherit pkgconfig openssl;
+ inherit zlib pkgconfig openssl;
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
};
@@ -477,6 +475,8 @@ in
stdenv = clangStdenv;
};
+ libdislocator = callPackage ../tools/security/afl/libdislocator.nix { };
+
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
agrep = callPackage ../tools/text/agrep { };
@@ -673,6 +673,11 @@ in
bonfire = callPackage ../tools/misc/bonfire { };
+ buildbot = with python3Packages; toPythonApplication buildbot;
+ buildbot-ui = with python3Packages; toPythonApplication buildbot-ui;
+ buildbot-full = with python3Packages; toPythonApplication buildbot-full;
+ buildbot-worker = with python3Packages; toPythonApplication buildbot-worker;
+
bunny = callPackage ../tools/package-management/bunny { };
chezmoi = callPackage ../tools/misc/chezmoi { };
@@ -974,6 +979,8 @@ in
bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
+ blur-effect = callPackage ../tools/graphics/blur-effect { };
+
charles = charles4;
inherit (callPackage ../applications/networking/charles {})
charles3
@@ -992,6 +999,8 @@ in
cudnn = cudnn_cudatoolkit_9_0;
};
+ behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
+
blink1-tool = callPackage ../tools/misc/blink1-tool { };
bliss = callPackage ../applications/science/math/bliss { };
@@ -1347,7 +1356,7 @@ in
dtrx = callPackage ../tools/compression/dtrx { };
- dune = callPackage ../development/tools/ocaml/dune { };
+ inherit (ocamlPackages) dune;
duperemove = callPackage ../tools/filesystems/duperemove { };
@@ -1942,7 +1951,7 @@ in
cksfv = callPackage ../tools/networking/cksfv { };
- clementine = callPackage ../applications/audio/clementine {
+ clementine = libsForQt5.callPackage ../applications/audio/clementine {
gst_plugins =
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
};
@@ -2119,6 +2128,8 @@ in
cfssl = callPackage ../tools/security/cfssl { };
+ chafa = callPackage ../tools/misc/chafa { };
+
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
civetweb = callPackage ../development/libraries/civetweb { };
@@ -2340,6 +2351,8 @@ in
inherit (pythonPackages) mutagen python wrapPython;
};
+ picotts = callPackage ../tools/audio/picotts { };
+
wgetpaste = callPackage ../tools/text/wgetpaste { };
dirmngr = callPackage ../tools/security/dirmngr { };
@@ -2423,7 +2436,7 @@ in
duo-unix = callPackage ../tools/security/duo-unix { };
duplicacy = callPackage ../tools/backup/duplicacy { };
-
+
duplicati = callPackage ../tools/backup/duplicati { };
duplicity = callPackage ../tools/backup/duplicity {
@@ -2500,6 +2513,8 @@ in
zabbix-cli = callPackage ../tools/misc/zabbix-cli { };
+ zzuf = callPackage ../tools/security/zzuf { };
+
### DEVELOPMENT / EMSCRIPTEN
buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
@@ -2895,6 +2910,8 @@ in
gandi-cli = callPackage ../tools/networking/gandi-cli { };
+ gandom-fonts = callPackage ../data/fonts/gandom-fonts { };
+
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
garmintools = callPackage ../development/libraries/garmintools {};
@@ -3541,6 +3558,8 @@ in
intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
+ intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
+
invoice2data = callPackage ../tools/text/invoice2data { };
inxi = callPackage ../tools/system/inxi { };
@@ -3656,6 +3675,8 @@ in
jp2a = callPackage ../applications/misc/jp2a { };
+ jpeg-archive = callPackage ../applications/graphics/jpeg-archive { };
+
jpeginfo = callPackage ../applications/graphics/jpeginfo { };
jpegoptim = callPackage ../applications/graphics/jpegoptim { };
@@ -4086,6 +4107,8 @@ in
libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
+ libmicrodns = callPackage ../development/libraries/libmicrodns { };
+
libnids = callPackage ../tools/networking/libnids { };
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
@@ -4800,9 +4823,7 @@ in
pagmo2 = callPackage ../development/libraries/pagmo2 { };
- pakcs = callPackage ../development/compilers/pakcs {
- haskellPackages = haskell.packages.ghc844;
- };
+ pakcs = callPackage ../development/compilers/pakcs { };
pal = callPackage ../tools/misc/pal { };
@@ -4823,12 +4844,16 @@ in
parallel = callPackage ../tools/misc/parallel { };
+ parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { };
+
parcellite = callPackage ../tools/misc/parcellite { };
patchutils = callPackage ../tools/text/patchutils { };
parted = callPackage ../tools/misc/parted { };
+ paulstretch = callPackage ../applications/audio/paulstretch { };
+
pell = callPackage ../applications/misc/pell { };
pepper = callPackage ../tools/admin/salt/pepper { };
@@ -4886,6 +4911,8 @@ in
pdfcrack = callPackage ../tools/security/pdfcrack { };
+ pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { };
+
pdftag = callPackage ../tools/graphics/pdftag { };
pdf2svg = callPackage ../tools/graphics/pdf2svg { };
@@ -5225,6 +5252,8 @@ in
redsocks = callPackage ../tools/networking/redsocks { };
+ retext = callPackage ../applications/editors/retext { };
+
richgo = callPackage ../development/tools/richgo { };
rst2html5 = callPackage ../tools/text/rst2html5 { };
@@ -5405,10 +5434,14 @@ in
safeeyes = callPackage ../applications/misc/safeeyes { };
+ sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
+
salt = callPackage ../tools/admin/salt {};
salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
+ samim-fonts = callPackage ../data/fonts/samim-fonts {};
+
saml2aws = callPackage ../tools/security/saml2aws {};
samplicator = callPackage ../tools/networking/samplicator { };
@@ -5729,6 +5762,8 @@ in
strongswanTNC = strongswan.override { enableTNC = true; };
strongswanNM = strongswan.override { enableNetworkManager = true; };
+ stylish-haskell = haskell.lib.justStaticExecutables haskellPackages.stylish-haskell;
+
su = shadow.su;
subsonic = callPackage ../servers/misc/subsonic { };
@@ -6116,6 +6151,9 @@ in
vimer = callPackage ../tools/misc/vimer { };
+ vimpager = callPackage ../tools/misc/vimpager { };
+ vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
+
visidata = (newScope python3Packages) ../applications/misc/visidata {
};
@@ -6459,6 +6497,8 @@ in
xclip = callPackage ../tools/misc/xclip { };
+ xcur2png = callPackage ../tools/graphics/xcur2png { };
+
xcwd = callPackage ../tools/X11/xcwd { };
xtitle = callPackage ../tools/misc/xtitle { };
@@ -6538,8 +6578,8 @@ in
yarn = callPackage ../development/tools/yarn { };
- yarn2nix = callPackage ../development/tools/yarn2nix { };
- inherit (yarn2nix) mkYarnPackage;
+ yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix";
+ mkYarnPackage = yarn2nix;
yasr = callPackage ../applications/audio/yasr { };
@@ -7196,7 +7236,24 @@ in
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
- glslang = callPackage ../development/compilers/glslang { };
+ glslang = callPackage ../development/compilers/glslang {
+ spirv-tools = spirv-tools.overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Tools";
+ rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c";
+ sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym";
+ };
+ });
+ spirv-headers = spirv-tools.overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Tools";
+ rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
+ sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ };
+ });
+ };
go_bootstrap = if stdenv.isAarch64 then
srcOnly {
@@ -7876,6 +7933,8 @@ in
j = callPackage ../development/interpreters/j {};
+ janet = callPackage ../development/interpreters/janet {};
+
jimtcl = callPackage ../development/interpreters/jimtcl {};
jmeter = callPackage ../applications/networking/jmeter {};
@@ -8227,6 +8286,8 @@ in
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
+ bundler-audit = callPackage ../tools/security/bundler-audit { };
+
solargraph = callPackage ../development/ruby-modules/solargraph { };
inherit (callPackage ../development/interpreters/ruby {
@@ -8359,6 +8420,16 @@ in
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
};
+ msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
+
+ msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
+ msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix {
+ inherit (buildPackages.xorg) lndir;
+ newlib = newlibCross;
+ };
+
+ mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
+
pharo-vms = callPackage ../development/pharo/vm { };
pharo = pharo-vms.multi-vm-wrapper;
pharo-cog32 = pharo-vms.cog32;
@@ -8409,7 +8480,7 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheKafka = apacheKafka_2_1;
+ apacheKafka = apacheKafka_2_2;
apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
@@ -8417,6 +8488,7 @@ in
apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
+ apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
kt = callPackage ../tools/misc/kt {};
@@ -8483,6 +8555,8 @@ in
bazel-watcher = callPackage ../development/tools/bazel-watcher { };
+ bazelisk = callPackage ../development/tools/bazelisk { };
+
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
bear = callPackage ../development/tools/build-managers/bear { };
@@ -8529,6 +8603,8 @@ in
byacc = callPackage ../development/tools/parsing/byacc { };
+ cadre = callPackage ../development/tools/cadre { };
+
casperjs = callPackage ../development/tools/casperjs {
inherit (texFunctions) fontsConf;
};
@@ -9202,6 +9278,8 @@ in
selendroid = callPackage ../development/tools/selenium/selendroid { };
+ semver-tool = callPackage ../development/tools/misc/semver-tool { };
+
sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
scons = sconsPackages.scons_latest;
@@ -9252,6 +9330,7 @@ in
spin = callPackage ../development/tools/analysis/spin { };
+ spirv-headers = callPackage ../development/libraries/spirv-headers { };
spirv-tools = callPackage ../development/tools/spirv-tools { };
splint = callPackage ../development/tools/analysis/splint {
@@ -9583,11 +9662,7 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { };
- cachix = (callPackage ../development/tools/cachix { }).overrideAttrs (drv: {
- meta = drv.meta // {
- hydraPlatforms = stdenv.lib.platforms.unix;
- };
- });
+ cachix = callPackage ../development/tools/cachix { };
capnproto = callPackage ../development/libraries/capnproto { };
@@ -9889,6 +9964,7 @@ in
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
openal = if stdenv.isDarwin then null else openal;
+ libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
@@ -10126,6 +10202,7 @@ in
else if name == "bionic" then targetPackages.bionic or bionic
else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross
else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
+ else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross
else if name == "newlib" then targetPackages.newlibCross or newlibCross
else if name == "musl" then targetPackages.muslCross or muslCross
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
@@ -10848,9 +10925,7 @@ in
libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
- libunity = callPackage ../development/libraries/libunity {
- inherit (gnome3) gnome-common;
- };
+ libunity = callPackage ../development/libraries/libunity { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
@@ -11679,6 +11754,8 @@ in
};
});
+ libykclient = callPackage ../development/libraries/libykclient { };
+
libykneomgr = callPackage ../development/libraries/libykneomgr { };
libytnef = callPackage ../development/libraries/libytnef { };
@@ -11904,6 +11981,8 @@ in
nix = nixUnstable;
};
+ nika-fonts = callPackage ../data/fonts/nika-fonts { };
+
nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
@@ -13092,7 +13171,33 @@ in
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
- vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
+ vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {
+ glslang = (glslang.override {
+ spirv-tools = spirv-tools.overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Tools";
+ rev = "5994ae2a045015004cce24802dc47c33736486ea";
+ sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6";
+ };
+ });
+ spirv-headers = spirv-tools.overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "SPIRV-Headers";
+ rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
+ sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ };
+ });
+ }).overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "glslang";
+ rev = "5432f0dd8f331f15182681664d7486681e8514e6";
+ sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm";
+ };
+ });
+ };
vtkWithQt4 = vtk.override { qtLib = qt4; };
@@ -13242,6 +13347,8 @@ in
yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { };
+ yubico-pam = callPackage ../development/libraries/yubico-pam { };
+
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
@@ -13597,10 +13704,9 @@ in
apcupsd = callPackage ../servers/apcupsd { };
- asterisk = asterisk-stable;
-
inherit (callPackages ../servers/asterisk { })
- asterisk-stable asterisk-lts;
+ asterisk asterisk-stable asterisk-lts
+ asterisk_13 asterisk_15 asterisk_16;
sabnzbd = callPackage ../servers/sabnzbd { };
@@ -14764,13 +14870,6 @@ in
];
};
- linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix {
- kernelPatches =
- [ kernelPatches.bridge_stp_helper
- kernelPatches.modinst_arg_list_too_long
- ];
- };
-
linux_5_0 = callPackage ../os-specific/linux/kernel/linux-5.0.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -14852,6 +14951,8 @@ in
ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
+ it87 = callPackage ../os-specific/linux/it87 {};
+
ena = callPackage ../os-specific/linux/ena {};
v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
@@ -14971,7 +15072,6 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
- linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20);
linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0);
# When adding to this list:
# - Update linuxPackages_latest to the latest version
@@ -15377,6 +15477,8 @@ in
speedometer = callPackage ../os-specific/linux/speedometer { };
+ statik = callPackage ../development/tools/statik { };
+
statifier = callPackage ../os-specific/linux/statifier { };
sysdig = callPackage ../os-specific/linux/sysdig {
@@ -15857,6 +15959,8 @@ in
man-pages = callPackage ../data/documentation/man-pages { };
+ manrope = callPackage ../data/fonts/manrope { };
+
matcha = callPackage ../data/themes/matcha { };
materia-theme = callPackage ../data/themes/materia-theme { };
@@ -15948,6 +16052,8 @@ in
papis = callPackage ../tools/misc/papis { };
+ paps = callPackage ../tools/misc/paps { };
+
pecita = callPackage ../data/fonts/pecita {};
paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {};
@@ -16079,6 +16185,8 @@ in
source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
+ spleen = callPackage ../data/fonts/spleen { };
+
sudo-font = callPackage ../data/fonts/sudo { };
inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
@@ -16482,6 +16590,8 @@ in
notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
+ brig = callPackage ../applications/networking/brig { };
+
bristol = callPackage ../applications/audio/bristol { };
bs1770gain = callPackage ../applications/audio/bs1770gain { };
@@ -18109,7 +18219,13 @@ in
kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
- kitty = callPackage ../applications/misc/kitty { };
+ kitty = callPackage ../applications/misc/kitty {
+ harfbuzz = if stdenv.isDarwin then harfbuzz.override {
+ withCoreText = true;
+ } else harfbuzz;
+ inherit (darwin) cf-private;
+ inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
+ };
kiwix = callPackage ../applications/misc/kiwix { };
@@ -19078,6 +19194,8 @@ in
protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { };
+ protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
+
psi = callPackage ../applications/networking/instant-messengers/psi { };
psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
@@ -19312,6 +19430,8 @@ in
rofi-systemd = callPackage ../tools/system/rofi-systemd { };
+ rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
+
rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
@@ -20518,6 +20638,8 @@ in
xtrace = callPackage ../tools/X11/xtrace { };
+ xtruss = callPackage ../tools/X11/xtruss { };
+
xmacro = callPackage ../tools/X11/xmacro { };
xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { };
@@ -20885,6 +21007,8 @@ in
gogui = callPackage ../games/gogui {};
+ gscrabble = python3Packages.callPackage ../games/gscrabble {};
+
gshogi = python3Packages.callPackage ../games/gshogi {};
gtetrinet = callPackage ../games/gtetrinet {
@@ -20948,6 +21072,8 @@ in
liquidwar5 = callPackage ../games/liquidwar/5.nix {
};
+ lugaru = callPackage ../games/lugaru {};
+
macopix = callPackage ../games/macopix {
gtk = gtk2;
};
@@ -21050,7 +21176,9 @@ in
pacvim = callPackage ../games/pacvim { };
- performous = callPackage ../games/performous { };
+ performous = callPackage ../games/performous {
+ boost = boost166;
+ };
pingus = callPackage ../games/pingus {};
@@ -21524,6 +21652,8 @@ in
gtk = gtk2;
};
+ solarc-gtk-theme = callPackage ../misc/themes/solarc { };
+
xfce = xfce4-12;
xfceUnstable = xfce4-13;
@@ -21642,6 +21772,8 @@ in
inormalize = callPackage ../applications/science/biology/inormalize { };
+ itsx = callPackage ../applications/science/biology/itsx { };
+
iv = callPackage ../applications/science/biology/iv {
neuron-version = neuron.version;
};
@@ -21666,6 +21798,10 @@ in
mrbayes = callPackage ../applications/science/biology/mrbayes { };
+ megahit = callPackage ../applications/science/biology/megahit { };
+
+ messer-slim = callPackage ../applications/science/biology/messer-slim { };
+
minc_tools = callPackage ../applications/science/biology/minc-tools { };
minc_widgets = callPackage ../applications/science/biology/minc-widgets { };
@@ -22573,7 +22709,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
- websocat = callPackage ../tools/misc/websocat { };
+ websocat = callPackage ../tools/misc/websocat {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
epkowa = callPackage ../misc/drivers/epkowa { };
@@ -22583,6 +22721,8 @@ in
illum = callPackage ../tools/system/illum { };
+ image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
+
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
@@ -23118,6 +23258,8 @@ in
vaultenv = haskellPackages.vaultenv;
+ vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
+
vbam = callPackage ../misc/emulators/vbam {
ffmpeg = ffmpeg_2;
};
@@ -23316,6 +23458,10 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
+ bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix {
+ inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
+ };
+
inherit (callPackages ../development/libraries/spdlog { })
spdlog_0 spdlog_1;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 5f55d88cb772..f08f2eacc23c 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -19,6 +19,7 @@ let
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {};
coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
+ coqhammer = callPackage ../development/coq-modules/coqhammer {};
coqprime = callPackage ../development/coq-modules/coqprime {};
coquelicot = callPackage ../development/coq-modules/coquelicot {};
corn = callPackage ../development/coq-modules/corn {};
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 46a00b698e34..5907b0099dd3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -223,6 +223,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
+ dune = callPackage ../development/tools/ocaml/dune { };
+
earley = callPackage ../development/ocaml-modules/earley { };
earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { };
@@ -355,9 +357,7 @@ let
lablgl = callPackage ../development/ocaml-modules/lablgl { };
- lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 {
- cairo2 = cairo2.override { enableGtkSupport = false; };
- };
+ lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };
lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { };
@@ -381,6 +381,8 @@ let
labltk = callPackage ../development/ocaml-modules/labltk { };
+ lacaml = callPackage ../development/ocaml-modules/lacaml { };
+
lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; };
lambdaTerm =
if lib.versionOlder "4.02" ocaml.version
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 165064414048..e7763bc557b6 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -253,23 +253,24 @@ let
};
composer = pkgs.stdenv.mkDerivation rec {
- name = "composer-${version}";
- version = "1.8.0";
+ pname = "composer";
+ version = "1.8.4";
src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
- sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089";
+ sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp";
};
unpackPhase = ":";
- buildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ pkgs.makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
- --add-flags "$out/libexec/composer/composer.phar"
+ --add-flags "$out/libexec/composer/composer.phar" \
+ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
'';
meta = with pkgs.lib; {
@@ -368,12 +369,12 @@ let
};
phpcs = pkgs.stdenv.mkDerivation rec {
- name = "phpcs-${version}";
- version = "3.4.0";
+ pname = "phpcs";
+ version = "3.4.1";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
- sha256 = "1d6zf0ab76r5ibb80q46silhy87hrwh50gfvhd0i25wzad7r09mw";
+ sha256 = "07zwj8msy0awnrwmv3gcilbsj9jyrvxw0q523yf16ydv55422pl0";
};
phases = [ "installPhase" ];
@@ -395,12 +396,12 @@ let
};
phpcbf = pkgs.stdenv.mkDerivation rec {
- name = "phpcbf-${version}";
- version = "3.4.0";
+ pname = "phpcbf";
+ version = "3.4.1";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
- sha256 = "0iscs4hg1msk8198pmkdmbxn1g53gbq3i5qgszs0bi6hz3ng9ag9";
+ sha256 = "052fsgzc39mfjy34mv1ip2qdghypsy218wfp8vh3a593pzkmzdcv";
};
phases = [ "installPhase" ];
@@ -422,12 +423,12 @@ let
};
phpstan = pkgs.stdenv.mkDerivation rec {
- name = "phpstan-${version}";
- version = "0.11.3";
+ pname = "phpstan";
+ version = "0.11.5";
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "0wiyrjymnhh0bzf0di27k59j2dprczwxiq19spj9gyfkbfw8fgci";
+ sha256 = "13akllfr5dav0y61i4ym5ww8z32ynwj5lpvsfiwx6z52avmcrc29";
};
phases = [ "installPhase" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20b77c87108c..aad6a3976f40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -274,6 +274,8 @@ in {
bap = pkgs.ocamlPackages.bap;
};
+ baselines = callPackage ../development/python-modules/baselines { };
+
bash_kernel = callPackage ../development/python-modules/bash_kernel { };
bayespy = callPackage ../development/python-modules/bayespy { };
@@ -615,6 +617,8 @@ in {
pybind11 = callPackage ../development/python-modules/pybind11 { };
+ pybullet = callPackage ../development/python-modules/pybullet { };
+
pycairo = callPackage ../development/python-modules/pycairo {
inherit (pkgs) pkgconfig;
};
@@ -1363,7 +1367,10 @@ in {
cheetah = callPackage ../development/python-modules/cheetah { };
- cherrypy = callPackage ../development/python-modules/cherrypy {};
+ cherrypy = if isPy3k then
+ callPackage ../development/python-modules/cherrypy { }
+ else
+ callPackage ../development/python-modules/cherrypy/17.nix { };
cfgv = callPackage ../development/python-modules/cfgv { };
@@ -1749,6 +1756,8 @@ in {
dmenu-python = callPackage ../development/python-modules/dmenu { };
+ dnslib = callPackage ../development/python-modules/dnslib { };
+
dnspython = callPackage ../development/python-modules/dnspython { };
dns = self.dnspython; # Alias for compatibility, 2017-12-10
@@ -3122,6 +3131,8 @@ in {
marisa-trie = callPackage ../development/python-modules/marisa-trie { };
+ Markups = callPackage ../development/python-modules/Markups { };
+
markupsafe = callPackage ../development/python-modules/markupsafe { };
marshmallow = callPackage ../development/python-modules/marshmallow { };
@@ -3181,6 +3192,8 @@ in {
minimock = callPackage ../development/python-modules/minimock { };
+ minio = callPackage ../development/python-modules/minio { };
+
moviepy = callPackage ../development/python-modules/moviepy { };
mozterm = callPackage ../development/python-modules/mozterm { };
@@ -3928,6 +3941,8 @@ in {
purepng = callPackage ../development/python-modules/purepng { };
+ pyhocon = callPackage ../development/python-modules/pyhocon { };
+
pymaging = callPackage ../development/python-modules/pymaging { };
pymaging_png = callPackage ../development/python-modules/pymaging_png { };
@@ -3958,6 +3973,8 @@ in {
pysvn = callPackage ../development/python-modules/pysvn { };
+ python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
+
python-ptrace = callPackage ../development/python-modules/python-ptrace { };
python-wifi = callPackage ../development/python-modules/python-wifi { };
@@ -4017,6 +4034,10 @@ in {
retry_decorator = callPackage ../development/python-modules/retry_decorator { };
+ roboschool = callPackage ../development/python-modules/roboschool {
+ inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package
+ };
+
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
quamash = callPackage ../development/python-modules/quamash { };
@@ -5437,6 +5458,8 @@ in {
lzstring = callPackage ../development/python-modules/lzstring { };
flickrapi = callPackage ../development/python-modules/flickrapi { };
+
+ aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
});
in fix' (extends overrides packages)
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index b06bb5393bea..f4210fcfc72e 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -140,6 +140,7 @@ in
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
});
+ msp430 = mapTestOnCross lib.systems.examples.msp430 embedded;
avr = mapTestOnCross lib.systems.examples.avr embedded;
arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded;
powerpc-embedded = mapTestOnCross lib.systems.examples.ppc-embedded embedded;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index ec6ed357c688..a093442d3698 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -96,19 +96,20 @@ let
} @ args:
if actuallySplice then spliceReal args else pkgsHostTarget;
- splicedPackages = splicePackages rec {
- pkgsBuildBuild = pkgs.buildPackages.buildPackages;
- pkgsBuildHost = pkgs.buildPackages;
- pkgsBuildTarget =
- if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform
- then pkgsBuildHost
- else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; pkgsHostTarget;
- pkgsHostHost = {}; # unimplemented
- pkgsHostTarget = pkgs;
- pkgsTargetTarget = pkgs.targetPackages;
+ splicedPackages = splicePackages {
+ inherit (pkgs)
+ pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
+ pkgsHostHost pkgsHostTarget
+ pkgsTargetTarget
+ ;
} // {
# These should never be spliced under any circumstances
- inherit (pkgs) pkgs buildPackages targetPackages;
+ inherit (pkgs)
+ pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
+ pkgsHostHost pkgsHostTarget
+ pkgsTargetTarget
+ buildPackages pkgs targetPackages
+ ;
inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform;
};
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 0ee5c25b0101..9f4b63293ef6 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -21,18 +21,23 @@
## Other parameters
##
-, # The package set used at build-time. If null, `buildPackages` will
- # be defined internally as the final produced package set itself. This allows
- # us to avoid expensive splicing.
- buildPackages
-
-, # The package set used in the next stage. If null, `targetPackages` will be
- # defined internally as the final produced package set itself, just like with
- # `buildPackages` and for the same reasons.
+, # Either null or an object in the form:
#
- # THIS IS A HACK for compilers that don't think critically about cross-
- # compilation. Please do *not* use unless you really know what you are doing.
- targetPackages
+ # {
+ # pkgsBuildBuild = ...;
+ # pkgsBuildHost = ...;
+ # pkgsBuildTarget = ...;
+ # pkgsHostHost = ...;
+ # # pkgsHostTarget skipped on purpose.
+ # pkgsTargetTarget ...;
+ # }
+ #
+ # These are references to adjacent bootstrapping stages. The more familiar
+ # `buildPackages` and `targetPackages` are defined in terms of them. If null,
+ # they are instead defined internally as the current stage. This allows us to
+ # avoid expensive splicing. `pkgsHostTarget` is skipped because it is always
+ # defined as the current stage.
+ adjacentPackages
, # The standard environment to use for building packages.
stdenv
@@ -70,11 +75,33 @@ let
inherit (self) runtimeShell;
};
- stdenvBootstappingAndPlatforms = self: super: {
- buildPackages = (if buildPackages == null then self else buildPackages)
- // { recurseForDerivations = false; };
- targetPackages = (if targetPackages == null then self else targetPackages)
+ stdenvBootstappingAndPlatforms = self: super: let
+ withFallback = thisPkgs:
+ (if adjacentPackages == null then self else thisPkgs)
// { recurseForDerivations = false; };
+ in {
+ # Here are package sets of from related stages. They are all in the form
+ # `pkgs{theirHost}{theirTarget}`. For example, `pkgsBuildHost` means their
+ # host platform is our build platform, and their target platform is our host
+ # platform. We only care about their host/target platforms, not their build
+ # platform, because the the former two alone affect the interface of the
+ # final package; the build platform is just an implementation detail that
+ # should not leak.
+ pkgsBuildBuild = withFallback adjacentPackages.pkgsBuildBuild;
+ pkgsBuildHost = withFallback adjacentPackages.pkgsBuildHost;
+ pkgsBuildTarget = withFallback adjacentPackages.pkgsBuildTarget;
+ pkgsHostHost = withFallback adjacentPackages.pkgsHostHost;
+ pkgsHostTarget = self // { recurseForDerivations = false; }; # always `self`
+ pkgsTargetTarget = withFallback adjacentPackages.pkgsTargetTarget;
+
+ # Older names for package sets. Use these when only the host platform of the
+ # package set matter (i.e. use `buildPackages` where any of `pkgsBuild*`
+ # would do, and `targetPackages` when any of `pkgsTarget*` would do (if we
+ # had more than just `pkgsTargetTarget`).)
+ buildPackages = self.pkgsBuildHost;
+ pkgs = self.pkgsHostTarget;
+ targetPackages = self.pkgsTargetTarget;
+
inherit stdenv;
};
@@ -87,7 +114,7 @@ let
inherit (hostPlatform) system;
};
- splice = self: super: import ./splice.nix lib self (buildPackages != null);
+ splice = self: super: import ./splice.nix lib self (adjacentPackages != null);
allPackages = self: super:
let res = import ./all-packages.nix
@@ -135,6 +162,9 @@ let
# default GNU libc on Linux systems. Non-Linux systems are not
# supported.
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
+ overlays = [ (self': super': {
+ pkgsMusl = super';
+ })] ++ overlays;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
@@ -151,6 +181,9 @@ let
# All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun {
+ overlays = [ (self': super': {
+ pkgsi686Linux = super';
+ })] ++ overlays;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
@@ -176,6 +209,9 @@ let
# Fully static packages.
# Currently uses Musl on Linux (couldn’t get static glibc to work).
pkgsStatic = nixpkgsFun ({
+ overlays = [ (self': super': {
+ pkgsStatic = super';
+ })] ++ overlays;
crossOverlays = [ (import ./static.nix) ];
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
crossSystem = {