diff --git a/doc/Makefile b/doc/Makefile
index ba77be6678c4..173e1c0b19ee 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -69,7 +69,7 @@ highlightjs:
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
-manual-full.xml: ${MD_TARGETS} .version *.xml
+manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
.version:
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b3..da664394f262 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,9 +47,10 @@
In Nixpkgs, these three platforms are defined as attribute sets under the
- names buildPlatform, hostPlatform, and
- targetPlatform. They are always defined as attributes in
- the standard environment. That means one can access them like:
+ names buildPlatform, hostPlatform,
+ and targetPlatform. They are always defined as
+ attributes in the standard environment. That means one can access them
+ like:
{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
.
diff --git a/doc/functions.xml b/doc/functions.xml
index 8223a8b0531c..88011061ae6e 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -7,1016 +7,11 @@
The nixpkgs repository has several utility functions to manipulate Nix
expressions.
-
- Overriding
-
- Sometimes one wants to override parts of nixpkgs, e.g.
- derivation attributes, the results of derivations or even the whole package
- set.
-
-
-
- <pkg>.override
-
-
- The function override is usually available for all the
- derivations in the nixpkgs expression (pkgs).
-
-
-
- It is used to override the arguments passed to a function.
-
-
-
- Example usages:
-pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
-
-import pkgs.path { overlays = [ (self: super: {
- foo = super.foo.override { barSupport = true ; };
- })]};
-
-
-mypkg = pkgs.callPackage ./mypkg.nix {
- mydep = pkgs.mydep.override { ... };
- }
-
-
-
-
- In the first example, pkgs.foo is the result of a
- function call with some default arguments, usually a derivation. Using
- pkgs.foo.override will call the same function with the
- given new arguments.
-
-
-
-
- <pkg>.overrideAttrs
-
-
- The function overrideAttrs allows overriding the
- attribute set passed to a stdenv.mkDerivation call,
- producing a new derivation based on the original one. This function is
- available on all derivations produced by the
- stdenv.mkDerivation function, which is most packages in
- the nixpkgs expression pkgs.
-
-
-
- Example usage:
-
-helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
- separateDebugInfo = true;
-});
-
-
-
-
- In the above example, the separateDebugInfo attribute is
- overridden to be true, thus building debug info for
- helloWithDebug, while all other attributes will be
- retained from the original hello package.
-
-
-
- The argument oldAttrs is conventionally used to refer to
- the attr set originally passed to stdenv.mkDerivation.
-
-
-
-
- Note that separateDebugInfo is processed only by the
- stdenv.mkDerivation function, not the generated, raw
- Nix derivation. Thus, using overrideDerivation will not
- work in this case, as it overrides only the attributes of the final
- derivation. It is for this reason that overrideAttrs
- should be preferred in (almost) all cases to
- overrideDerivation, i.e. to allow using
- sdenv.mkDerivation to process input arguments, as well
- as the fact that it is easier to use (you can use the same attribute names
- you see in your Nix code, instead of the ones generated (e.g.
- buildInputs vs nativeBuildInputs,
- and involves less typing.
-
-
-
-
-
- <pkg>.overrideDerivation
-
-
-
- You should prefer overrideAttrs in almost all cases,
- see its documentation for the reasons why.
- overrideDerivation is not deprecated and will continue
- to work, but is less nice to use and does not have as many abilities as
- overrideAttrs.
-
-
-
-
-
- Do not use this function in Nixpkgs as it evaluates a Derivation before
- modifying it, which breaks package abstraction and removes error-checking
- of function arguments. In addition, this evaluation-per-function
- application incurs a performance penalty, which can become a problem if
- many overrides are used. It is only intended for ad-hoc customisation,
- such as in ~/.config/nixpkgs/config.nix.
-
-
-
-
- The function overrideDerivation creates a new derivation
- based on an existing one by overriding the original's attributes with the
- attribute set produced by the specified function. This function is
- available on all derivations defined using the
- makeOverridable function. Most standard
- derivation-producing functions, such as
- stdenv.mkDerivation, are defined using this function,
- which means most packages in the nixpkgs expression,
- pkgs, have this function.
-
-
-
- Example usage:
-
-mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
- name = "sed-4.2.2-pre";
- src = fetchurl {
- url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
- sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
- };
- patches = [];
-});
-
-
-
-
- In the above example, the name, src,
- and patches of the derivation will be overridden, while
- all other attributes will be retained from the original derivation.
-
-
-
- The argument oldAttrs is used to refer to the attribute
- set of the original derivation.
-
-
-
-
- A package's attributes are evaluated *before* being modified by the
- overrideDerivation function. For example, the
- name attribute reference in url =
- "mirror://gnu/hello/${name}.tar.gz"; is filled-in *before* the
- overrideDerivation function modifies the attribute set.
- This means that overriding the name attribute, in this
- example, *will not* change the value of the url
- attribute. Instead, we need to override both the name
- *and* url attributes.
-
-
-
-
-
- lib.makeOverridable
-
-
- The function lib.makeOverridable is used to make the
- result of a function easily customizable. This utility only makes sense for
- functions that accept an argument set and return an attribute set.
-
-
-
- Example usage:
-
-f = { a, b }: { result = a+b; };
-c = lib.makeOverridable f { a = 1; b = 2; };
-
-
-
-
- The variable c is the value of the f
- function applied with some default arguments. Hence the value of
- c.result is 3, in this example.
-
-
-
- The variable c however also has some additional
- functions, like c.override which
- can be used to override the default arguments. In this example the value of
- (c.override { a = 4; }).result is 6.
-
-
-
-
- Generators
-
-
- Generators are functions that create file formats from nix data structures,
- e. g. for configuration files. There are generators available for:
- INI, JSON and YAML
-
-
-
- All generators follow a similar call interface: generatorName
- configFunctions data, where configFunctions is an
- attrset of user-defined functions that format nested parts of the content.
- They each have common defaults, so often they do not need to be set
- manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]"
- ] name) from the INI generator. It receives the
- name of a section and sanitizes it. The default
- mkSectionName escapes [ and
- ] with a backslash.
-
-
-
- Generators can be fine-tuned to produce exactly the file format required by
- your application/service. One example is an INI-file format which uses
- : as separator, the strings
- "yes"/"no" as boolean values and
- requires all string values to be quoted:
-
-
-
-with lib;
-let
- customToINI = generators.toINI {
- # specifies how to format a key/value pair
- mkKeyValue = generators.mkKeyValueDefault {
- # specifies the generated string for a subset of nix values
- mkValueString = v:
- if v == true then ''"yes"''
- else if v == false then ''"no"''
- else if isString v then ''"${v}"''
- # and delegats all other values to the default generator
- else generators.mkValueStringDefault {} v;
- } ":";
- };
-
-# the INI file can now be given as plain old nix values
-in customToINI {
- main = {
- pushinfo = true;
- autopush = false;
- host = "localhost";
- port = 42;
- };
- mergetool = {
- merge = "diff3";
- };
-}
-
-
-
- This will produce the following INI file as nix string:
-
-
-
-[main]
-autopush:"no"
-host:"localhost"
-port:42
-pushinfo:"yes"
-str\:ange:"very::strange"
-
-[mergetool]
-merge:"diff3"
-
-
-
-
- Nix store paths can be converted to strings by enclosing a derivation
- attribute like so: "${drv}".
-
-
-
-
- Detailed documentation for each generator can be found in
- lib/generators.nix.
-
-
-
- Debugging Nix Expressions
-
-
- Nix is a unityped, dynamic language, this means every value can potentially
- appear anywhere. Since it is also non-strict, evaluation order and what
- ultimately is evaluated might surprise you. Therefore it is important to be
- able to debug nix expressions.
-
-
-
- In the lib/debug.nix file you will find a number of
- functions that help (pretty-)printing values while evaluation is runnnig.
- You can even specify how deep these values should be printed recursively,
- and transform them on the fly. Please consult the docstrings in
- lib/debug.nix for usage information.
-
-
-
- buildFHSUserEnv
-
-
- buildFHSUserEnv provides a way to build and run
- FHS-compatible lightweight sandboxes. It creates an isolated root with bound
- /nix/store, so its footprint in terms of disk space
- needed is quite small. This allows one to run software which is hard or
- unfeasible to patch for NixOS -- 3rd-party source trees with FHS
- assumptions, games distributed as tarballs, software with integrity checking
- and/or external self-updated binaries. It uses Linux namespaces feature to
- create temporary lightweight environments which are destroyed after all
- child processes exit, without root user rights requirement. Accepted
- arguments are:
-
-
-
-
-
- name
-
-
-
- Environment name.
-
-
-
-
-
- targetPkgs
-
-
-
- Packages to be installed for the main host's architecture (i.e. x86_64 on
- x86_64 installations). Along with libraries binaries are also installed.
-
-
-
-
-
- multiPkgs
-
-
-
- Packages to be installed for all architectures supported by a host (i.e.
- i686 and x86_64 on x86_64 installations). Only libraries are installed by
- default.
-
-
-
-
-
- extraBuildCommands
-
-
-
- Additional commands to be executed for finalizing the directory
- structure.
-
-
-
-
-
- extraBuildCommandsMulti
-
-
-
- Like extraBuildCommands, but executed only on multilib
- architectures.
-
-
-
-
-
- extraOutputsToInstall
-
-
-
- Additional derivation outputs to be linked for both target and
- multi-architecture packages.
-
-
-
-
-
- extraInstallCommands
-
-
-
- Additional commands to be executed for finalizing the derivation with
- runner script.
-
-
-
-
-
- runScript
-
-
-
- A command that would be executed inside the sandbox and passed all the
- command line arguments. It defaults to bash.
-
-
-
-
-
-
- One can create a simple environment using a shell.nix
- like that:
-
-
- {} }:
-
-(pkgs.buildFHSUserEnv {
- name = "simple-x11-env";
- targetPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]) ++ (with pkgs.xorg;
- [ libX11
- libXcursor
- libXrandr
- ]);
- multiPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]);
- runScript = "bash";
-}).env
-]]>
-
-
- Running nix-shell would then drop you into a shell with
- these libraries and binaries available. You can use this to run
- closed-source applications which expect FHS structure without hassles:
- simply change runScript to the application path, e.g.
- ./bin/start.sh -- relative paths are supported.
-
-
-
-
- pkgs.dockerTools
-
-
- pkgs.dockerTools is a set of functions for creating and
- manipulating Docker images according to the
-
- Docker Image Specification v1.2.0 . Docker itself is not used to
- perform any of the operations done by these functions.
-
-
-
-
- The dockerTools API is unstable and may be subject to
- backwards-incompatible changes in the future.
-
-
-
-
- buildImage
-
-
- This function is analogous to the docker build command,
- in that can used to build a Docker-compatible repository tarball containing
- a single image with one or multiple layers. As such, the result is suitable
- for being loaded in Docker with docker load.
-
-
-
- The parameters of buildImage with relative example
- values are described below:
-
-
-
- Docker build
-
-buildImage {
- name = "redis";
- tag = "latest";
-
- fromImage = someBaseImage;
- fromImageName = null;
- fromImageTag = "latest";
-
- contents = pkgs.redis;
- runAsRoot = ''
- #!${stdenv.shell}
- mkdir -p /data
- '';
-
- config = {
- Cmd = [ "/bin/redis-server" ];
- WorkingDir = "/data";
- Volumes = {
- "/data" = {};
- };
- };
-}
-
-
-
-
- The above example will build a Docker image redis/latest
- from the given base image. Loading and running this image in Docker results
- in redis-server being started automatically.
-
-
-
-
-
- name specifies the name of the resulting image. This
- is the only required argument for buildImage.
-
-
-
-
- tag specifies the tag of the resulting image. By
- default it's null, which indicates that the nix output
- hash will be used as tag.
-
-
-
-
- fromImage is the repository tarball containing the
- base image. It must be a valid Docker image, such as exported by
- docker save. By default it's null,
- which can be seen as equivalent to FROM scratch of a
- Dockerfile.
-
-
-
-
- fromImageName can be used to further specify the base
- image within the repository, in case it contains multiple images. By
- default it's null, in which case
- buildImage will peek the first image available in the
- repository.
-
-
-
-
- fromImageTag can be used to further specify the tag of
- the base image within the repository, in case an image contains multiple
- tags. By default it's null, in which case
- buildImage will peek the first tag available for the
- base image.
-
-
-
-
- contents is a derivation that will be copied in the
- new layer of the resulting image. This can be similarly seen as
- ADD contents/ / in a Dockerfile.
- By default it's null.
-
-
-
-
- runAsRoot is a bash script that will run as root in an
- environment that overlays the existing layers of the base image with the
- new resulting layer, including the previously copied
- contents derivation. This can be similarly seen as
- RUN ... in a Dockerfile.
-
-
- Using this parameter requires the kvm device to be
- available.
-
-
-
-
-
-
- config is used to specify the configuration of the
- containers that will be started off the built image in Docker. The
- available options are listed in the
-
- Docker Image Specification v1.2.0 .
-
-
-
-
-
- After the new layer has been created, its closure (to which
- contents, config and
- runAsRoot contribute) will be copied in the layer
- itself. Only new dependencies that are not already in the existing layers
- will be copied.
-
-
-
- At the end of the process, only one new single layer will be produced and
- added to the resulting image.
-
-
-
- The resulting repository will only list the single image
- image/tag. In the case of
- it would be
- redis/latest.
-
-
-
- It is possible to inspect the arguments with which an image was built using
- its buildArgs attribute.
-
-
-
-
- If you see errors similar to getProtocolByName: does not exist
- (no such protocol name: tcp) you may need to add
- pkgs.iana-etc to contents.
-
-
-
-
-
- If you see errors similar to Error_Protocol ("certificate has
- unknown CA",True,UnknownCa) you may need to add
- pkgs.cacert to contents.
-
-
-
-
- Impurely Defining a Docker Layer's Creation Date
-
- By default buildImage will use a static
- date of one second past the UNIX Epoch. This allows
- buildImage to produce binary reproducible
- images. When listing images with docker list
- images, the newly created images will be listed like
- this:
-
-
-
- You can break binary reproducibility but have a sorted,
- meaningful CREATED column by setting
- created to now.
-
-
-
- and now the Docker CLI will display a reasonable date and
- sort the images as expected:
-
- however, the produced images will not be binary reproducible.
-
-
-
-
-
- buildLayeredImage
-
-
- Create a Docker image with many of the store paths being on their own layer
- to improve sharing between images.
-
-
-
-
-
- name
-
-
-
- The name of the resulting image.
-
-
-
-
-
- tag optional
-
-
-
- Tag of the generated image.
-
-
- Default: the output path's hash
-
-
-
-
-
- contents optional
-
-
-
- Top level paths in the container. Either a single derivation, or a list
- of derivations.
-
-
- Default: []
-
-
-
-
-
- config optional
-
-
-
- Run-time configuration of the container. A full list of the options are
- available at in the
-
- Docker Image Specification v1.2.0 .
-
-
- Default: {}
-
-
-
-
-
- created optional
-
-
-
- Date and time the layers were created. Follows the same
- now exception supported by
- buildImage.
-
-
- Default: 1970-01-01T00:00:01Z
-
-
-
-
-
- maxLayers optional
-
-
-
- Maximum number of layers to create.
-
-
- Default: 24
-
-
-
-
-
-
- Behavior of <varname>contents</varname> in the final image
-
-
- Each path directly listed in contents will have a
- symlink in the root of the image.
-
-
-
- For example:
-
- will create symlinks for all the paths in the hello
- package:
- /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
-/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
-/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
-]]>
-
-
-
-
- Automatic inclusion of <varname>config</varname> references
-
-
- The closure of config is automatically included in the
- closure of the final image.
-
-
-
- This allows you to make very simple Docker images with very little code.
- This container will start up and run hello:
-
-
-
-
-
- Adjusting <varname>maxLayers</varname>
-
-
- Increasing the maxLayers increases the number of layers
- which have a chance to be shared between different images.
-
-
-
- Modern Docker installations support up to 128 layers, however older
- versions support as few as 42.
-
-
-
- If the produced image will not be extended by other Docker builds, it is
- safe to set maxLayers to 128.
- However it will be impossible to extend the image further.
-
-
-
- The first (maxLayers-2) most "popular" paths will have
- their own individual layers, then layer #maxLayers-1
- will contain all the remaining "unpopular" paths, and finally layer
- #maxLayers will contain the Image configuration.
-
-
-
- Docker's Layers are not inherently ordered, they are content-addressable
- and are not explicitly layered until they are composed in to an Image.
-
-
-
-
-
- pullImage
-
-
- This function is analogous to the docker pull command,
- in that can be used to pull a Docker image from a Docker registry. By
- default Docker Hub is
- used to pull images.
-
-
-
- Its parameters are described in the example below:
-
-
-
- Docker pull
-
-pullImage {
- imageName = "nixos/nix";
- imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
- finalImageTag = "1.11";
- sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
- os = "linux";
- arch = "x86_64";
-}
-
-
-
-
-
-
- imageName specifies the name of the image to be
- downloaded, which can also include the registry namespace (e.g.
- nixos). This argument is required.
-
-
-
-
- imageDigest specifies the digest of the image to be
- downloaded. Skopeo can be used to get the digest of an image, with its
- inspect subcommand. Since a given
- imageName may transparently refer to a manifest list
- of images which support multiple architectures and/or operating systems,
- supply the `--override-os` and `--override-arch` arguments to specify
- exactly which image you want. By default it will match the OS and
- architecture of the host the command is run on.
-
-$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
-sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-
- This argument is required.
-
-
-
-
- finalImageTag, if specified, this is the tag 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
- 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.
-
-
-
-
-
-
- exportImage
-
-
- This function is analogous to the docker export command,
- in that can used to flatten a Docker image that contains multiple layers.
- It is in fact the result of the merge of all the layers of the image. As
- such, the result is suitable for being imported in Docker with
- docker import.
-
-
-
-
- Using this function requires the kvm device to be
- available.
-
-
-
-
- The parameters of exportImage are the following:
-
-
-
- Docker export
-
-exportImage {
- fromImage = someLayeredImage;
- fromImageName = null;
- fromImageTag = null;
-
- name = someLayeredImage.name;
-}
-
-
-
-
- The parameters relative to the base image have the same synopsis as
- described in , except
- that fromImage is the only required argument in this
- case.
-
-
-
- The name argument is the name of the derivation output,
- which defaults to fromImage.name.
-
-
-
-
- shadowSetup
-
-
- This constant string is a helper for setting up the base files for managing
- users and groups, only if such files don't exist already. It is suitable
- for being used in a runAsRoot
- script for cases like
- in the example below:
-
-
-
- Shadow base files
-
-buildImage {
- name = "shadow-basic";
-
- runAsRoot = ''
- #!${stdenv.shell}
- ${shadowSetup}
- groupadd -r redis
- useradd -r -g redis redis
- mkdir /data
- chown redis:redis /data
- '';
-}
-
-
-
-
- Creating base files like /etc/passwd or
- /etc/login.defs are necessary for shadow-utils to
- manipulate users and groups.
-
-
-
+
+
+
+
+
+
diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml
new file mode 100644
index 000000000000..c6b3611eea53
--- /dev/null
+++ b/doc/functions/debug.xml
@@ -0,0 +1,21 @@
+
+ Debugging Nix Expressions
+
+
+ Nix is a unityped, dynamic language, this means every value can potentially
+ appear anywhere. Since it is also non-strict, evaluation order and what
+ ultimately is evaluated might surprise you. Therefore it is important to be
+ able to debug nix expressions.
+
+
+
+ In the lib/debug.nix file you will find a number of
+ functions that help (pretty-)printing values while evaluation is runnnig. You
+ can even specify how deep these values should be printed recursively, and
+ transform them on the fly. Please consult the docstrings in
+ lib/debug.nix for usage information.
+
+
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
new file mode 100644
index 000000000000..501f46a967c3
--- /dev/null
+++ b/doc/functions/dockertools.xml
@@ -0,0 +1,564 @@
+
+ pkgs.dockerTools
+
+
+ pkgs.dockerTools is a set of functions for creating and
+ manipulating Docker images according to the
+
+ Docker Image Specification v1.2.0 . Docker itself is not used to
+ perform any of the operations done by these functions.
+
+
+
+
+ The dockerTools API is unstable and may be subject to
+ backwards-incompatible changes in the future.
+
+
+
+
+ buildImage
+
+
+ This function is analogous to the docker build command,
+ in that can used to build a Docker-compatible repository tarball containing
+ a single image with one or multiple layers. As such, the result is suitable
+ for being loaded in Docker with docker load.
+
+
+
+ The parameters of buildImage with relative example values
+ are described below:
+
+
+
+ Docker build
+
+buildImage {
+ name = "redis";
+ tag = "latest";
+
+ fromImage = someBaseImage;
+ fromImageName = null;
+ fromImageTag = "latest";
+
+ contents = pkgs.redis;
+ runAsRoot = ''
+ #!${stdenv.shell}
+ mkdir -p /data
+ '';
+
+ config = {
+ Cmd = [ "/bin/redis-server" ];
+ WorkingDir = "/data";
+ Volumes = {
+ "/data" = {};
+ };
+ };
+}
+
+
+
+
+ The above example will build a Docker image redis/latest
+ from the given base image. Loading and running this image in Docker results
+ in redis-server being started automatically.
+
+
+
+
+
+ name specifies the name of the resulting image. This is
+ the only required argument for buildImage.
+
+
+
+
+ tag specifies the tag of the resulting image. By
+ default it's null, which indicates that the nix output
+ hash will be used as tag.
+
+
+
+
+ fromImage is the repository tarball containing the base
+ image. It must be a valid Docker image, such as exported by
+ docker save. By default it's null,
+ which can be seen as equivalent to FROM scratch of a
+ Dockerfile.
+
+
+
+
+ fromImageName can be used to further specify the base
+ image within the repository, in case it contains multiple images. By
+ default it's null, in which case
+ buildImage will peek the first image available in the
+ repository.
+
+
+
+
+ fromImageTag can be used to further specify the tag of
+ the base image within the repository, in case an image contains multiple
+ tags. By default it's null, in which case
+ buildImage will peek the first tag available for the
+ base image.
+
+
+
+
+ contents is a derivation that will be copied in the new
+ layer of the resulting image. This can be similarly seen as ADD
+ contents/ / in a Dockerfile. By default
+ it's null.
+
+
+
+
+ runAsRoot is a bash script that will run as root in an
+ environment that overlays the existing layers of the base image with the
+ new resulting layer, including the previously copied
+ contents derivation. This can be similarly seen as
+ RUN ... in a Dockerfile.
+
+
+ Using this parameter requires the kvm device to be
+ available.
+
+
+
+
+
+
+ config is used to specify the configuration of the
+ containers that will be started off the built image in Docker. The
+ available options are listed in the
+
+ Docker Image Specification v1.2.0 .
+
+
+
+
+
+ After the new layer has been created, its closure (to which
+ contents, config and
+ runAsRoot contribute) will be copied in the layer itself.
+ Only new dependencies that are not already in the existing layers will be
+ copied.
+
+
+
+ At the end of the process, only one new single layer will be produced and
+ added to the resulting image.
+
+
+
+ The resulting repository will only list the single image
+ image/tag. In the case of
+ it would be
+ redis/latest.
+
+
+
+ It is possible to inspect the arguments with which an image was built using
+ its buildArgs attribute.
+
+
+
+
+ If you see errors similar to getProtocolByName: does not exist (no
+ such protocol name: tcp) you may need to add
+ pkgs.iana-etc to contents.
+
+
+
+
+
+ If you see errors similar to Error_Protocol ("certificate has
+ unknown CA",True,UnknownCa) you may need to add
+ pkgs.cacert to contents.
+
+
+
+
+ Impurely Defining a Docker Layer's Creation Date
+
+ By default buildImage will use a static date of one
+ second past the UNIX Epoch. This allows buildImage to
+ produce binary reproducible images. When listing images with
+ docker list images, the newly created images will be
+ listed like this:
+
+
+
+ You can break binary reproducibility but have a sorted, meaningful
+ CREATED column by setting created to
+ now.
+
+
+
+ and now the Docker CLI will display a reasonable date and sort the images
+ as expected:
+
+ however, the produced images will not be binary reproducible.
+
+
+
+
+
+ buildLayeredImage
+
+
+ Create a Docker image with many of the store paths being on their own layer
+ to improve sharing between images.
+
+
+
+
+
+ name
+
+
+
+ The name of the resulting image.
+
+
+
+
+
+ tag optional
+
+
+
+ Tag of the generated image.
+
+
+ Default: the output path's hash
+
+
+
+
+
+ contents optional
+
+
+
+ Top level paths in the container. Either a single derivation, or a list
+ of derivations.
+
+
+ Default: []
+
+
+
+
+
+ config optional
+
+
+
+ Run-time configuration of the container. A full list of the options are
+ available at in the
+
+ Docker Image Specification v1.2.0 .
+
+
+ Default: {}
+
+
+
+
+
+ created optional
+
+
+
+ Date and time the layers were created. Follows the same
+ now exception supported by
+ buildImage.
+
+
+ Default: 1970-01-01T00:00:01Z
+
+
+
+
+
+ maxLayers optional
+
+
+
+ Maximum number of layers to create.
+
+
+ Default: 24
+
+
+
+
+
+
+ Behavior of <varname>contents</varname> in the final image
+
+
+ Each path directly listed in contents will have a
+ symlink in the root of the image.
+
+
+
+ For example:
+
+ will create symlinks for all the paths in the hello
+ package:
+ /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
+/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
+/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
+]]>
+
+
+
+
+ Automatic inclusion of <varname>config</varname> references
+
+
+ The closure of config is automatically included in the
+ closure of the final image.
+
+
+
+ This allows you to make very simple Docker images with very little code.
+ This container will start up and run hello:
+
+
+
+
+
+ Adjusting <varname>maxLayers</varname>
+
+
+ Increasing the maxLayers increases the number of layers
+ which have a chance to be shared between different images.
+
+
+
+ Modern Docker installations support up to 128 layers, however older
+ versions support as few as 42.
+
+
+
+ If the produced image will not be extended by other Docker builds, it is
+ safe to set maxLayers to 128. However
+ it will be impossible to extend the image further.
+
+
+
+ The first (maxLayers-2) most "popular" paths will have
+ their own individual layers, then layer #maxLayers-1
+ will contain all the remaining "unpopular" paths, and finally layer
+ #maxLayers will contain the Image configuration.
+
+
+
+ Docker's Layers are not inherently ordered, they are content-addressable
+ and are not explicitly layered until they are composed in to an Image.
+
+
+
+
+
+ pullImage
+
+
+ This function is analogous to the docker pull command, in
+ that can be used to pull a Docker image from a Docker registry. By default
+ Docker Hub is used to pull
+ images.
+
+
+
+ Its parameters are described in the example below:
+
+
+
+ Docker pull
+
+pullImage {
+ imageName = "nixos/nix";
+ imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
+ finalImageTag = "1.11";
+ sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
+ os = "linux";
+ arch = "x86_64";
+}
+
+
+
+
+
+
+ imageName specifies the name of the image to be
+ downloaded, which can also include the registry namespace (e.g.
+ nixos). This argument is required.
+
+
+
+
+ imageDigest specifies the digest of the image to be
+ downloaded. Skopeo can be used to get the digest of an image, with its
+ inspect subcommand. Since a given
+ imageName may transparently refer to a manifest list of
+ images which support multiple architectures and/or operating systems,
+ supply the `--override-os` and `--override-arch` arguments to specify
+ exactly which image you want. By default it will match the OS and
+ architecture of the host the command is run on.
+
+$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
+sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+
+ This argument is required.
+
+
+
+
+ finalImageTag, if specified, this is the tag 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
+ 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.
+
+
+
+
+
+
+ exportImage
+
+
+ This function is analogous to the docker export command,
+ in that can used to flatten a Docker image that contains multiple layers. It
+ is in fact the result of the merge of all the layers of the image. As such,
+ the result is suitable for being imported in Docker with docker
+ import.
+
+
+
+
+ Using this function requires the kvm device to be
+ available.
+
+
+
+
+ The parameters of exportImage are the following:
+
+
+
+ Docker export
+
+exportImage {
+ fromImage = someLayeredImage;
+ fromImageName = null;
+ fromImageTag = null;
+
+ name = someLayeredImage.name;
+}
+
+
+
+
+ The parameters relative to the base image have the same synopsis as
+ described in , except that
+ fromImage is the only required argument in this case.
+
+
+
+ The name argument is the name of the derivation output,
+ which defaults to fromImage.name.
+
+
+
+
+ shadowSetup
+
+
+ This constant string is a helper for setting up the base files for managing
+ users and groups, only if such files don't exist already. It is suitable for
+ being used in a runAsRoot
+ script for cases like
+ in the example below:
+
+
+
+ Shadow base files
+
+buildImage {
+ name = "shadow-basic";
+
+ runAsRoot = ''
+ #!${stdenv.shell}
+ ${shadowSetup}
+ groupadd -r redis
+ useradd -r -g redis redis
+ mkdir /data
+ chown redis:redis /data
+ '';
+}
+
+
+
+
+ Creating base files like /etc/passwd or
+ /etc/login.defs are necessary for shadow-utils to
+ manipulate users and groups.
+
+
+
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml
new file mode 100644
index 000000000000..79682080be31
--- /dev/null
+++ b/doc/functions/fhs-environments.xml
@@ -0,0 +1,142 @@
+
+ buildFHSUserEnv
+
+
+ buildFHSUserEnv provides a way to build and run
+ FHS-compatible lightweight sandboxes. It creates an isolated root with bound
+ /nix/store, so its footprint in terms of disk space
+ needed is quite small. This allows one to run software which is hard or
+ unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
+ games distributed as tarballs, software with integrity checking and/or
+ external self-updated binaries. It uses Linux namespaces feature to create
+ temporary lightweight environments which are destroyed after all child
+ processes exit, without root user rights requirement. Accepted arguments are:
+
+
+
+
+
+ name
+
+
+
+ Environment name.
+
+
+
+
+
+ targetPkgs
+
+
+
+ Packages to be installed for the main host's architecture (i.e. x86_64 on
+ x86_64 installations). Along with libraries binaries are also installed.
+
+
+
+
+
+ multiPkgs
+
+
+
+ Packages to be installed for all architectures supported by a host (i.e.
+ i686 and x86_64 on x86_64 installations). Only libraries are installed by
+ default.
+
+
+
+
+
+ extraBuildCommands
+
+
+
+ Additional commands to be executed for finalizing the directory structure.
+
+
+
+
+
+ extraBuildCommandsMulti
+
+
+
+ Like extraBuildCommands, but executed only on multilib
+ architectures.
+
+
+
+
+
+ extraOutputsToInstall
+
+
+
+ Additional derivation outputs to be linked for both target and
+ multi-architecture packages.
+
+
+
+
+
+ extraInstallCommands
+
+
+
+ Additional commands to be executed for finalizing the derivation with
+ runner script.
+
+
+
+
+
+ runScript
+
+
+
+ A command that would be executed inside the sandbox and passed all the
+ command line arguments. It defaults to bash.
+
+
+
+
+
+
+ One can create a simple environment using a shell.nix like
+ that:
+
+
+ {} }:
+
+(pkgs.buildFHSUserEnv {
+ name = "simple-x11-env";
+ targetPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]) ++ (with pkgs.xorg;
+ [ libX11
+ libXcursor
+ libXrandr
+ ]);
+ multiPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]);
+ runScript = "bash";
+}).env
+]]>
+
+
+ Running nix-shell would then drop you into a shell with
+ these libraries and binaries available. You can use this to run closed-source
+ applications which expect FHS structure without hassles: simply change
+ runScript to the application path, e.g.
+ ./bin/start.sh -- relative paths are supported.
+
+
diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml
new file mode 100644
index 000000000000..e860b10e8979
--- /dev/null
+++ b/doc/functions/generators.xml
@@ -0,0 +1,89 @@
+
+ Generators
+
+
+ Generators are functions that create file formats from nix data structures,
+ e. g. for configuration files. There are generators available for:
+ INI, JSON and YAML
+
+
+
+ All generators follow a similar call interface: generatorName
+ configFunctions data, where configFunctions is an
+ attrset of user-defined functions that format nested parts of the content.
+ They each have common defaults, so often they do not need to be set manually.
+ An example is mkSectionName ? (name: libStr.escape [ "[" "]" ]
+ name) from the INI generator. It receives the name
+ of a section and sanitizes it. The default mkSectionName
+ escapes [ and ] with a backslash.
+
+
+
+ Generators can be fine-tuned to produce exactly the file format required by
+ your application/service. One example is an INI-file format which uses
+ : as separator, the strings
+ "yes"/"no" as boolean values and
+ requires all string values to be quoted:
+
+
+
+with lib;
+let
+ customToINI = generators.toINI {
+ # specifies how to format a key/value pair
+ mkKeyValue = generators.mkKeyValueDefault {
+ # specifies the generated string for a subset of nix values
+ mkValueString = v:
+ if v == true then ''"yes"''
+ else if v == false then ''"no"''
+ else if isString v then ''"${v}"''
+ # and delegats all other values to the default generator
+ else generators.mkValueStringDefault {} v;
+ } ":";
+ };
+
+# the INI file can now be given as plain old nix values
+in customToINI {
+ main = {
+ pushinfo = true;
+ autopush = false;
+ host = "localhost";
+ port = 42;
+ };
+ mergetool = {
+ merge = "diff3";
+ };
+}
+
+
+
+ This will produce the following INI file as nix string:
+
+
+
+[main]
+autopush:"no"
+host:"localhost"
+port:42
+pushinfo:"yes"
+str\:ange:"very::strange"
+
+[mergetool]
+merge:"diff3"
+
+
+
+
+ Nix store paths can be converted to strings by enclosing a derivation
+ attribute like so: "${drv}".
+
+
+
+
+ Detailed documentation for each generator can be found in
+ lib/generators.nix.
+
+
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
new file mode 100644
index 000000000000..99e2a63631a7
--- /dev/null
+++ b/doc/functions/overrides.xml
@@ -0,0 +1,203 @@
+
+ Overriding
+
+
+ Sometimes one wants to override parts of nixpkgs, e.g.
+ derivation attributes, the results of derivations or even the whole package
+ set.
+
+
+
+ <pkg>.override
+
+
+ The function override is usually available for all the
+ derivations in the nixpkgs expression (pkgs).
+
+
+
+ It is used to override the arguments passed to a function.
+
+
+
+ Example usages:
+pkgs.foo.override { arg1 = val1; arg2 = val2; ... }
+
+import pkgs.path { overlays = [ (self: super: {
+ foo = super.foo.override { barSupport = true ; };
+ })]};
+
+
+mypkg = pkgs.callPackage ./mypkg.nix {
+ mydep = pkgs.mydep.override { ... };
+ }
+
+
+
+
+ In the first example, pkgs.foo is the result of a
+ function call with some default arguments, usually a derivation. Using
+ pkgs.foo.override will call the same function with the
+ given new arguments.
+
+
+
+
+ <pkg>.overrideAttrs
+
+
+ The function overrideAttrs allows overriding the
+ attribute set passed to a stdenv.mkDerivation call,
+ producing a new derivation based on the original one. This function is
+ available on all derivations produced by the
+ stdenv.mkDerivation function, which is most packages in
+ the nixpkgs expression pkgs.
+
+
+
+ Example usage:
+
+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+ separateDebugInfo = true;
+});
+
+
+
+
+ In the above example, the separateDebugInfo attribute is
+ overridden to be true, thus building debug info for
+ helloWithDebug, while all other attributes will be
+ retained from the original hello package.
+
+
+
+ The argument oldAttrs is conventionally used to refer to
+ the attr set originally passed to stdenv.mkDerivation.
+
+
+
+
+ Note that separateDebugInfo is processed only by the
+ stdenv.mkDerivation function, not the generated, raw Nix
+ derivation. Thus, using overrideDerivation will not work
+ in this case, as it overrides only the attributes of the final derivation.
+ It is for this reason that overrideAttrs should be
+ preferred in (almost) all cases to overrideDerivation,
+ i.e. to allow using sdenv.mkDerivation to process input
+ arguments, as well as the fact that it is easier to use (you can use the
+ same attribute names you see in your Nix code, instead of the ones
+ generated (e.g. buildInputs vs
+ nativeBuildInputs, and involves less typing.
+
+
+
+
+
+ <pkg>.overrideDerivation
+
+
+
+ You should prefer overrideAttrs in almost all cases, see
+ its documentation for the reasons why.
+ overrideDerivation is not deprecated and will continue
+ to work, but is less nice to use and does not have as many abilities as
+ overrideAttrs.
+
+
+
+
+
+ Do not use this function in Nixpkgs as it evaluates a Derivation before
+ modifying it, which breaks package abstraction and removes error-checking
+ of function arguments. In addition, this evaluation-per-function
+ application incurs a performance penalty, which can become a problem if
+ many overrides are used. It is only intended for ad-hoc customisation, such
+ as in ~/.config/nixpkgs/config.nix.
+
+
+
+
+ The function overrideDerivation creates a new derivation
+ based on an existing one by overriding the original's attributes with the
+ attribute set produced by the specified function. This function is available
+ on all derivations defined using the makeOverridable
+ function. Most standard derivation-producing functions, such as
+ stdenv.mkDerivation, are defined using this function,
+ which means most packages in the nixpkgs expression,
+ pkgs, have this function.
+
+
+
+ Example usage:
+
+mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+ name = "sed-4.2.2-pre";
+ src = fetchurl {
+ url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
+ sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
+ };
+ patches = [];
+});
+
+
+
+
+ In the above example, the name, src,
+ and patches of the derivation will be overridden, while
+ all other attributes will be retained from the original derivation.
+
+
+
+ The argument oldAttrs is used to refer to the attribute
+ set of the original derivation.
+
+
+
+
+ A package's attributes are evaluated *before* being modified by the
+ overrideDerivation function. For example, the
+ name attribute reference in url =
+ "mirror://gnu/hello/${name}.tar.gz"; is filled-in *before* the
+ overrideDerivation function modifies the attribute set.
+ This means that overriding the name attribute, in this
+ example, *will not* change the value of the url
+ attribute. Instead, we need to override both the name
+ *and* url attributes.
+
+
+
+
+
+ lib.makeOverridable
+
+
+ The function lib.makeOverridable is used to make the
+ result of a function easily customizable. This utility only makes sense for
+ functions that accept an argument set and return an attribute set.
+
+
+
+ Example usage:
+
+f = { a, b }: { result = a+b; };
+c = lib.makeOverridable f { a = 1; b = 2; };
+
+
+
+
+ The variable c is the value of the f
+ function applied with some default arguments. Hence the value of
+ c.result is 3, in this example.
+
+
+
+ The variable c however also has some additional
+ functions, like c.override which can
+ be used to override the default arguments. In this example the value of
+ (c.override { a = 4; }).result is 6.
+
+
+
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml
new file mode 100644
index 000000000000..e5031c9463c0
--- /dev/null
+++ b/doc/functions/shell.xml
@@ -0,0 +1,26 @@
+
+ pkgs.mkShell
+
+
+ pkgs.mkShell is a special kind of derivation that is
+ only useful when using it combined with nix-shell. It will
+ in fact fail to instantiate when invoked with nix-build.
+
+
+
+ Usage
+
+ {} }:
+pkgs.mkShell {
+ # this will make all the build inputs from hello and gnutar
+ # available to the shell environment
+ inputsFrom = with pkgs; [ hello gnutar ];
+ buildInputs = [ pkgs.gnumake ];
+}
+]]>
+
+
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index d8f55ef0a856..0543e06a05d4 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -413,11 +413,8 @@ packageOverrides = pkgs: {
in your /etc/nixos/configuration.nix. You'll also need
hardware.pulseaudio.support32Bit = true;
if you are using PulseAudio - this will enable 32bit ALSA apps integration.
- To use the Steam controller, you need to add
-services.udev.extraRules = ''
- SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
- KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput"
- '';
+ To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
+hardware.steam-hardware.enable = true;
to your configuration.
@@ -671,8 +668,9 @@ overrides = self: super: rec {
plugins = with availablePlugins; [ python perl ];
}
}
- If the configure function returns an attrset without the plugins
- attribute, availablePlugins will be used automatically.
+ If the configure function returns an attrset without the
+ plugins attribute, availablePlugins
+ will be used automatically.
@@ -706,9 +704,11 @@ overrides = self: super: rec {
}; }
+
- WeeChat allows to set defaults on startup using the --run-command.
- The configure method can be used to pass commands to the program:
+ WeeChat allows to set defaults on startup using the
+ --run-command. The configure method
+ can be used to pass commands to the program:
weechat.override {
configure = { availablePlugins, ... }: {
init = ''
@@ -717,12 +717,14 @@ overrides = self: super: rec {
'';
};
}
- Further values can be added to the list of commands when running
- weechat --run-command "your-commands".
+ Further values can be added to the list of commands when running
+ weechat --run-command "your-commands".
+
- Additionally it's possible to specify scripts to be loaded when starting weechat.
- These will be loaded before the commands from init:
+ Additionally it's possible to specify scripts to be loaded when starting
+ weechat. These will be loaded before the commands from
+ init:
weechat.override {
configure = { availablePlugins, ... }: {
scripts = with pkgs.weechatScripts; [
@@ -734,11 +736,13 @@ overrides = self: super: rec {
};
}
+
- In nixpkgs there's a subpackage which contains derivations for
- WeeChat scripts. Such derivations expect a passthru.scripts attribute
- which contains a list of all scripts inside the store path. Furthermore all scripts
- have to live in $out/share. An exemplary derivation looks like this:
+ In nixpkgs there's a subpackage which contains
+ derivations for WeeChat scripts. Such derivations expect a
+ passthru.scripts attribute which contains a list of all
+ scripts inside the store path. Furthermore all scripts have to live in
+ $out/share. An exemplary derivation looks like this:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
@@ -817,20 +821,26 @@ citrix_receiver.override {
ibus-engines.typing-booster
- This package is an ibus-based completion method to speed up typing.
+
+ This package is an ibus-based completion method to speed up typing.
+
Activating the engine
- IBus needs to be configured accordingly to activate typing-booster. The configuration
- depends on the desktop manager in use. For detailed instructions, please refer to the
- upstream docs.
+ IBus needs to be configured accordingly to activate
+ typing-booster. The configuration depends on the desktop
+ manager in use. For detailed instructions, please refer to the
+ upstream
+ docs.
+
- On NixOS you need to explicitly enable ibus with given engines
- before customizing your desktop to use typing-booster. This can be achieved
- using the ibus module:
+ On NixOS you need to explicitly enable ibus with given
+ engines before customizing your desktop to use
+ typing-booster. This can be achieved using the
+ ibus module:
{ pkgs, ... }: {
i18n.inputMethod = {
enabled = "ibus";
@@ -844,17 +854,20 @@ citrix_receiver.override {
Using custom hunspell dictionaries
- The IBus engine is based on hunspell to support completion in many languages.
- By default the dictionaries de-de, en-us, es-es,
- it-it, sv-se and sv-fi
- are in use. To add another dictionary, the package can be overridden like this:
+ The IBus engine is based on hunspell to support
+ completion in many languages. By default the dictionaries
+ de-de, en-us,
+ es-es, it-it,
+ sv-se and sv-fi are in use. To add
+ another dictionary, the package can be overridden like this:
ibus-engines.typing-booster.override {
langs = [ "de-at" "en-gb" ];
}
+
- Note: each language passed to langs must be an attribute name in
- pkgs.hunspellDicts.
+ Note: each language passed to langs must be an
+ attribute name in pkgs.hunspellDicts.
@@ -862,10 +875,12 @@ citrix_receiver.override {
Built-in emoji picker
- The ibus-engines.typing-booster package contains a program
- named emoji-picker. To display all emojis correctly,
- a special font such as noto-fonts-emoji is needed:
+ The ibus-engines.typing-booster package contains a
+ program named emoji-picker. To display all emojis
+ correctly, a special font such as noto-fonts-emoji is
+ needed:
+
On NixOS it can be installed using the following expression:
{ pkgs, ... }: {
diff --git a/doc/shell.section.md b/doc/shell.section.md
deleted file mode 100644
index cb8832a814fc..000000000000
--- a/doc/shell.section.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: pkgs.mkShell
-author: zimbatm
-date: 2017-10-30
----
-
-# mkShell
-
-pkgs.mkShell is a special kind of derivation that is only useful when using
-it combined with nix-shell. It will in fact fail to instantiate when invoked
-with nix-build.
-
-## Usage
-
-```nix
-{ pkgs ? import {} }:
-pkgs.mkShell {
- # this will make all the build inputs from hello and gnutar available to the shell environment
- inputsFrom = with pkgs; [ hello gnutar ];
- buildInputs = [ pkgs.gnumake ];
-}
-```
diff --git a/lib/options.nix b/lib/options.nix
index 01160b48ec01..0e3421175306 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -8,7 +8,31 @@ with lib.strings;
rec {
+ # Returns true when the given argument is an option
+ #
+ # Examples:
+ # isOption 1 // => false
+ # isOption (mkOption {}) // => true
isOption = lib.isType "option";
+
+ # Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
+ #
+ # default: Default value used when no definition is given in the configuration.
+ # defaultText: Textual representation of the default, for in the manual.
+ # example: Example value used in the manual.
+ # description: String describing the option.
+ # type: Option type, providing type-checking and value merging.
+ # apply: Function that converts the option value to something else.
+ # internal: Whether the option is for NixOS developers only.
+ # visible: Whether the option shows up in the manual.
+ # readOnly: Whether the option can be set only once
+ # options: Obsolete, used by types.optionSet.
+ #
+ # All keys default to `null` when not given.
+ #
+ # Examples:
+ # mkOption { } // => { _type = "option"; }
+ # mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
mkOption =
{ default ? null # Default value used when no definition is given in the configuration.
, defaultText ? null # Textual representation of the default, for in the manual.
@@ -24,6 +48,10 @@ rec {
} @ attrs:
attrs // { _type = "option"; };
+ # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off:
+ #
+ # Examples:
+ # mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
mkEnableOption = name: mkOption {
default = false;
example = true;
@@ -74,7 +102,18 @@ rec {
else
val) (head defs).value defs;
+ # Extracts values of all "value" keys of the given list
+ #
+ # Examples:
+ # getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
+ # getValues [ ] // => [ ]
getValues = map (x: x.value);
+
+ # Extracts values of all "file" keys of the given list
+ #
+ # Examples:
+ # getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
+ # getFiles [ ] // => [ ]
getFiles = map (x: x.file);
# Generate documentation template from the list of option declaration like
diff --git a/lib/sources.nix b/lib/sources.nix
index 704711b20cd9..e64b23414e86 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -26,6 +26,10 @@ rec {
(type == "symlink" && lib.hasPrefix "result" baseName)
);
+ # Filters a source tree removing version control files and directories using cleanSourceWith
+ #
+ # Example:
+ # cleanSource ./.
cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
# Like `builtins.filterSource`, except it will compose with itself,
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7178c8c0a1e1..7b17555bfe5d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1135,6 +1135,11 @@
github = "dtzWill";
name = "Will Dietz";
};
+ dysinger = {
+ email = "tim@dysinger.net";
+ github = "dysinger";
+ name = "Tim Dysinger";
+ };
dywedir = {
email = "dywedir@protonmail.ch";
github = "dywedir";
@@ -1640,6 +1645,11 @@
github = "hamhut1066";
name = "Hamish Hutchings";
};
+ haslersn = {
+ email = "haslersn@fius.informatik.uni-stuttgart.de";
+ github = "haslersn";
+ name = "Sebastian Hasler";
+ };
havvy = {
email = "ryan.havvy@gmail.com";
github = "havvy";
@@ -2437,6 +2447,11 @@
github = "ma27";
name = "Maximilian Bosch";
};
+ ma9e = {
+ email = "sean@lfo.team";
+ github = "ma9e";
+ name = "Sean Haugh";
+ };
madjar = {
email = "georges.dubus@compiletoi.net";
github = "madjar";
@@ -3309,6 +3324,11 @@
github = "proglodyte";
name = "Proglodyte";
};
+ prusnak = {
+ email = "stick@gk2.sk";
+ github = "prusnak";
+ name = "Pavol Rusnak";
+ };
pshendry = {
email = "paul@pshendry.com";
github = "pshendry";
@@ -4307,6 +4327,11 @@
github = "uri-canva";
name = "Uri Baghin";
};
+ uskudnik = {
+ email = "urban.skudnik@gmail.com";
+ github = "uskudnik";
+ name = "Urban Skudnik";
+ };
utdemir = {
email = "me@utdemir.com";
github = "utdemir";
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 2e9adf70c396..b251a1f5e2c3 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -4,7 +4,7 @@ all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml
-manual-combined.xml: generated *.xml
+manual-combined.xml: generated *.xml **/*.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index c5934111749c..0b311189430c 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -9,13 +9,12 @@
For systems without CD drive, the NixOS live CD can be booted from a USB
stick. You can use the dd utility to write the image:
dd if=path-to-image
- of=/dev/sdb. Be careful about specifying
+ of=/dev/sdX. Be careful about specifying
the correct drive; you can use the lsblk command to get a
list of block devices.
-
-
-
- On macOS:
+
+ On macOS
+
$ diskutil list
[..]
@@ -26,43 +25,16 @@ $ diskutil unmountDisk diskN
Unmount of all volumes on diskN was successful
$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
- Using the 'raw' rdiskN device instead of
- diskN completes in minutes instead of hours. After
- dd completes, a GUI dialog "The disk you inserted was not
- readable by this computer" will pop up, which can be ignored.
+ Using the 'raw' rdiskN device instead of
+ diskN completes in minutes instead of hours. After
+ dd completes, a GUI dialog "The disk you inserted was
+ not readable by this computer" will pop up, which can be ignored.
+
+
The dd utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations.
- For non-UEFI installations, you can alternatively use
- unetbootin. If
- you cannot use dd for a UEFI installation, you can also
- mount the ISO, copy its contents verbatim to your drive, then either:
-
-
-
- Change the label of the disk partition to the label of the ISO (visible
- with the blkid command), or
-
-
-
-
- Edit loader/entries/nixos-livecd.conf on the drive
- and change the root= field in the
- options line to point to your drive (see the
- documentation on root= in
-
- the kernel documentation for more details).
-
-
-
-
- If you want to load the contents of the ISO to ram after bootin (So you
- can remove the stick after bootup) you can append the parameter
- copytoram to the options field.
-
-
-
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 1366e8f93596..2b68def95b70 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -4,60 +4,46 @@
version="5.0"
xml:id="sec-installation">
Installing NixOS
-
- NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
- installation is by and large the same as a BIOS installation. The differences
- are mentioned in the steps that follow.
-
-
-
-
- Boot from the CD.
-
-
-
-
- UEFI systems
-
-
-
- You should boot the live CD in UEFI mode (consult your specific
- hardware's documentation for instructions). You may find the
- rEFInd boot
- manager useful.
-
-
-
-
-
-
-
- The CD contains a basic NixOS installation. (It also contains Memtest86+,
- useful if you want to test new hardware). When it’s finished booting, it
- should have detected most of your hardware.
-
-
-
-
- The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
- or by running nixos-help.
-
-
-
-
- You get logged in as root (with empty password).
-
-
-
-
- If you downloaded the graphical ISO image, you can run systemctl
- start display-manager to start KDE. If you want to continue on
- the terminal, you can use loadkeys to switch to your
- preferred keyboard layout. (We even provide neo2 via loadkeys de
- neo!)
-
-
-
+
+ Booting the system
+
+
+ NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
+ installation is by and large the same as a BIOS installation. The
+ differences are mentioned in the steps that follow.
+
+
+
+ The installation media can be burned to a CD, or now more commonly, "burned"
+ to a USB drive (see ).
+
+
+
+ The installation media contains a basic NixOS installation. When it’s
+ finished booting, it should have detected most of your hardware.
+
+
+
+ The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
+ or by running nixos-help.
+
+
+
+ You are logged-in automatically as root. (The
+ root user account has an empty password.)
+
+
+
+ If you downloaded the graphical ISO image, you can run systemctl
+ start display-manager to start KDE. If you want to continue on the
+ terminal, you can use loadkeys to switch to your
+ preferred keyboard layout. (We even provide neo2 via loadkeys de
+ neo!)
+
+
+
+ Networking in the installer
+
The boot process should have brought up networking (check ip
a). Networking is necessary for the installer, since it will
@@ -65,58 +51,165 @@
binaries). It’s best if you have a DHCP server on your network. Otherwise
configure networking manually using ifconfig.
+
To manually configure the network on the graphical installer, first disable
network-manager with systemctl stop network-manager.
+
To manually configure the wifi on the minimal installer, run
wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID'
'key').
-
-
+
If you would like to continue the installation from a different machine you
need to activate the SSH daemon via systemctl start
sshd. In order to be able to login you also need to set a
password for root using passwd.
-
-
+
+
+
+ Partitioning and formatting
+
+
+ The NixOS installer doesn’t do any partitioning or formatting, so you need
+ to do that yourself.
+
+
+
+ The NixOS installer ships with multiple partitioning tools. The examples
+ below use parted, but also provides
+ fdisk, gdisk,
+ cfdisk, and cgdisk.
+
+
+
+ The recommended partition scheme differs depending if the computer uses
+ Legacy Boot or UEFI.
+
+
+
+ UEFI (GPT)
+
- The NixOS installer doesn’t do any partitioning or formatting yet, so you
- need to do that yourself. Use the following commands:
-
+ Here's an example partition scheme for UEFI, using
+ /dev/sda as the device.
+
+
+ You can safely ignore parted's informational message
+ about needing to update /etc/fstab.
+
+
+
+
+
+
- For partitioning: fdisk.
-
-# fdisk /dev/sda # (or whatever device you want to install on)
--- for UEFI systems only
-> n # (create a new partition for /boot)
-> 3 # (make it a partition number 3)
-> # (press enter to accept the default)
-> +512M # (the size of the UEFI boot partition)
-> t # (change the partition type ...)
-> 3 # (... of the boot partition ...)
-> 1 # (... to 'UEFI System')
--- for BIOS or UEFI systems
-> n # (create a new partition for /swap)
-> 2 # (make it a partition number 2)
-> # (press enter to accept the default)
-> +8G # (the size of the swap partition, set to whatever you like)
-> n # (create a new partition for /)
-> 1 # (make it a partition number 1)
-> # (press enter to accept the default)
-> # (press enter to accept the default and use the rest of the remaining space)
-> a # (make the partition bootable)
-> x # (enter expert mode)
-> f # (fix up the partition ordering)
-> r # (exit expert mode)
-> w # (write the partition table to disk and exit)
+ Create a GPT partition table.
+# parted /dev/sda -- mklabel gpt
+
+
+ Add a swap partition. The size required will vary
+ according to needs, here a 8GiB one is created. The space left in front
+ (512MiB) will be used by the boot partition.
+# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB
+
+
+ The swap partition size rules are no different than for other Linux
+ distributions.
+
+
+
+
+
+
+ Next, add the root partition. This will fill the
+ remainder ending part of the disk.
+# parted /dev/sda -- mkpart primary 8.5GiB -1MiB
+
+
+
+
+ Finally, the boot partition. NixOS by default uses
+ the ESP (EFI system partition) as its /boot
+ partition. It uses the initially reserved 512MiB at the start of the
+ disk.
+# parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+# parted /dev/sda -- set 3 boot on
+
+
+
+
+
+
+ Once complete, you can follow with
+ .
+
+
+
+
+ Legacy Boot (MBR)
+
+
+ Here's an example partition scheme for Legacy Boot, using
+ /dev/sda as the device.
+
+
+ You can safely ignore parted's informational message
+ about needing to update /etc/fstab.
+
+
+
+
+
+
+
+
+ Create a MBR partition table.
+# parted /dev/sda -- mklabel msdos
+
+
+
+
+ Add a swap partition. The size required will vary
+ according to needs, here a 8GiB one is created.
+# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB
+
+
+ The swap partition size rules are no different than for other Linux
+ distributions.
+
+
+
+
+
+
+ Finally, add the root partition. This will fill the
+ remainder of the disk.
+# parted /dev/sda -- mkpart primary 8GiB -1s
+
+
+
+
+
+
+ Once complete, you can follow with
+ .
+
+
+
+
+ Formatting
+
+
+ Use the following commands:
+
For initialising Ext4 partitions: mkfs.ext4. It is
@@ -169,242 +262,249 @@
-
-
-
- Mount the target file system on which NixOS should be installed on
- /mnt, e.g.
+
+
+
+ Installing
+
+
+
+
+ Mount the target file system on which NixOS should be installed on
+ /mnt, e.g.
# mount /dev/disk/by-label/nixos /mnt
-
-
-
-
-
-
- UEFI systems
-
-
-
- Mount the boot file system on /mnt/boot, e.g.
+
+
+
+
+
+
+ UEFI systems
+
+
+
+ Mount the boot file system on /mnt/boot, e.g.
# mkdir -p /mnt/boot
# mount /dev/disk/by-label/boot /mnt/boot
-
-
-
-
-
-
-
- If your machine has a limited amount of memory, you may want to activate
- swap devices now (swapon
- device). The installer (or rather, the
- build actions that it may spawn) may need quite a bit of RAM, depending on
- your configuration.
+
+
+
+
+
+
+
+ If your machine has a limited amount of memory, you may want to activate
+ swap devices now (swapon
+ device). The installer (or rather,
+ the build actions that it may spawn) may need quite a bit of RAM,
+ depending on your configuration.
# swapon /dev/sda2
-
-
-
-
- You now need to create a file
- /mnt/etc/nixos/configuration.nix that specifies the
- intended configuration of the system. This is because NixOS has a
- declarative configuration model: you create or edit a
- description of the desired configuration of your system, and then NixOS
- takes care of making it happen. The syntax of the NixOS configuration file
- is described in , while a list of
- available configuration options appears in
-
+
+
+
+ You now need to create a file
+ /mnt/etc/nixos/configuration.nix that specifies the
+ intended configuration of the system. This is because NixOS has a
+ declarative configuration model: you create or edit a
+ description of the desired configuration of your system, and then NixOS
+ takes care of making it happen. The syntax of the NixOS configuration file
+ is described in , while a list
+ of available configuration options appears in
+ . A minimal example is shown in
- .
-
-
- The command nixos-generate-config can generate an
- initial configuration file for you:
+
+
+ The command nixos-generate-config can generate an
+ initial configuration file for you:
# nixos-generate-config --root /mnt
- You should then edit /mnt/etc/nixos/configuration.nix
- to suit your needs:
+ You should then edit /mnt/etc/nixos/configuration.nix
+ to suit your needs:
# nano /mnt/etc/nixos/configuration.nix
- If you’re using the graphical ISO image, other editors may be available
- (such as vim). If you have network access, you can also
- install other editors — for instance, you can install Emacs by running
- nix-env -i emacs.
-
-
-
-
- BIOS systems
-
-
-
- You must set the option
- to specify on which disk
- the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
-
-
-
-
-
- UEFI systems
-
-
-
- You must set the option
- to
- true. nixos-generate-config should
- do this automatically for new configurations when booted in UEFI mode.
-
-
- You may want to look at the options starting with
-
- and
-
- as well.
-
-
-
-
-
- If there are other operating systems running on the machine before
- installing NixOS, the
- option can be set to true to automatically add them to
- the grub menu.
-
-
- Another critical option is , specifying the
- file systems that need to be mounted by NixOS. However, you typically
- don’t need to set it yourself, because
- nixos-generate-config sets it automatically in
- /mnt/etc/nixos/hardware-configuration.nix from your
- currently mounted file systems. (The configuration file
- hardware-configuration.nix is included from
- configuration.nix and will be overwritten by future
- invocations of nixos-generate-config; thus, you
- generally should not modify it.)
-
-
-
- Depending on your hardware configuration or type of file system, you may
- need to set the option to
- include the kernel modules that are necessary for mounting the root file
- system, otherwise the installed system will not be able to boot. (If this
- happens, boot from the CD again, mount the target file system on
- /mnt, fix
- /mnt/etc/nixos/configuration.nix and rerun
- nixos-install.) In most cases,
- nixos-generate-config will figure out the required
- modules.
+ If you’re using the graphical ISO image, other editors may be available
+ (such as vim). If you have network access, you can also
+ install other editors — for instance, you can install Emacs by running
+ nix-env -i emacs.
-
-
-
-
- Do the installation:
+
+
+
+ BIOS systems
+
+
+
+ You must set the option
+ to specify on which disk
+ the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+
+
+
+
+
+ UEFI systems
+
+
+
+ You must set the option
+ to
+ true. nixos-generate-config
+ should do this automatically for new configurations when booted in UEFI
+ mode.
+
+
+ You may want to look at the options starting with
+
+ and
+
+ as well.
+
+
+
+
+
+ If there are other operating systems running on the machine before
+ installing NixOS, the
+ option can be set to true to automatically add them to
+ the grub menu.
+
+
+ Another critical option is , specifying the
+ file systems that need to be mounted by NixOS. However, you typically
+ don’t need to set it yourself, because
+ nixos-generate-config sets it automatically in
+ /mnt/etc/nixos/hardware-configuration.nix from your
+ currently mounted file systems. (The configuration file
+ hardware-configuration.nix is included from
+ configuration.nix and will be overwritten by future
+ invocations of nixos-generate-config; thus, you
+ generally should not modify it.)
+
+
+
+ Depending on your hardware configuration or type of file system, you may
+ need to set the option to
+ include the kernel modules that are necessary for mounting the root file
+ system, otherwise the installed system will not be able to boot. (If this
+ happens, boot from the installation media again, mount the target file
+ system on /mnt, fix
+ /mnt/etc/nixos/configuration.nix and rerun
+ nixos-install.) In most cases,
+ nixos-generate-config will figure out the required
+ modules.
+
+
+
+
+
+ Do the installation:
# nixos-install
- Cross fingers. If this fails due to a temporary problem (such as a network
- issue while downloading binaries from the NixOS binary cache), you can just
- re-run nixos-install. Otherwise, fix your
- configuration.nix and then re-run
- nixos-install.
-
-
- As the last step, nixos-install will ask you to set the
- password for the root user, e.g.
+ Cross fingers. If this fails due to a temporary problem (such as a network
+ issue while downloading binaries from the NixOS binary cache), you can
+ just re-run nixos-install. Otherwise, fix your
+ configuration.nix and then re-run
+ nixos-install.
+
+
+ As the last step, nixos-install will ask you to set the
+ password for the root user, e.g.
setting root password...
Enter new UNIX password: ***
-Retype new UNIX password: ***
-
-
-
- For unattended installations, it is possible to use
- nixos-install --no-root-passwd in order to disable the
- password prompt entirely.
-
-
-
-
-
-
- If everything went well:
+Retype new UNIX password: ***
+
+
+ For unattended installations, it is possible to use
+ nixos-install --no-root-passwd in order to disable
+ the password prompt entirely.
+
+
+
+
+
+
+ If everything went well:
- # reboot
-
-
-
-
- You should now be able to boot into the installed NixOS. The GRUB boot menu
- shows a list of available configurations (initially
- just one). Every time you change the NixOS configuration (see
-
+
+
+
+
+ You should now be able to boot into the installed NixOS. The GRUB boot
+ menu shows a list of available configurations
+ (initially just one). Every time you change the NixOS configuration (see
+ Changing Configuration
- ), a new item is added to the menu. This allows you to easily roll back to
- a previous configuration if something goes wrong.
-
-
- You should log in and change the root password with
- passwd.
-
-
- You’ll probably want to create some user accounts as well, which can be
- done with useradd:
+ ), a new item is added to the menu. This allows you to easily roll back to
+ a previous configuration if something goes wrong.
+
+
+ You should log in and change the root password with
+ passwd.
+
+
+ You’ll probably want to create some user accounts as well, which can be
+ done with useradd:
$ useradd -c 'Eelco Dolstra' -m eelco
$ passwd eelco
-
-
- You may also want to install some software. For instance,
+
+
+ You may also want to install some software. For instance,
$ nix-env -qa \*
- shows what packages are available, and
+ shows what packages are available, and
$ nix-env -i w3m
- install the w3m browser.
-
-
-
-
- To summarise, shows a typical sequence
- of commands for installing NixOS on an empty hard drive (here
- /dev/sda). w3m browser.
+
+
+
+
+
+ Installation summary
+
+
+ To summarise, shows a typical
+ sequence of commands for installing NixOS on an empty hard drive (here
+ /dev/sda). shows a
- corresponding configuration Nix expression.
-
-
- Commands for Installing NixOS on <filename>/dev/sda</filename>
-
-# fdisk /dev/sda # (or whatever device you want to install on)
--- for UEFI systems only
-> n # (create a new partition for /boot)
-> 3 # (make it a partition number 3)
-> # (press enter to accept the default)
-> +512M # (the size of the UEFI boot partition)
-> t # (change the partition type ...)
-> 3 # (... of the boot partition ...)
-> 1 # (... to 'UEFI System')
--- for BIOS or UEFI systems
-> n # (create a new partition for /swap)
-> 2 # (make it a partition number 2)
-> # (press enter to accept the default)
-> +8G # (the size of the swap partition)
-> n # (create a new partition for /)
-> 1 # (make it a partition number 1)
-> # (press enter to accept the default)
-> # (press enter to accept the default and use the rest of the remaining space)
-> a # (make the partition bootable)
-> x # (enter expert mode)
-> f # (fix up the partition ordering)
-> r # (exit expert mode)
-> w # (write the partition table to disk and exit)
+ corresponding configuration Nix expression.
+
+
+
+ Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)
+
+# parted /dev/sda -- mklabel msdos
+# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB
+# parted /dev/sda -- mkpart primary 8GiB -1s
+
+
+
+ Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)
+
+# parted /dev/sda -- mklabel gpt
+# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB
+# parted /dev/sda -- mkpart primary 8.5GiB -1MiB
+# parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+# parted /dev/sda -- set 3 boot on
+
+
+
+ Commands for Installing NixOS on <filename>/dev/sda</filename>
+
+ With a partitioned disk.
+
# mkfs.ext4 -L nixos /dev/sda1
# mkswap -L swap /dev/sda2
# swapon /dev/sda2
@@ -416,9 +516,11 @@ $ nix-env -i w3m
# nano /mnt/etc/nixos/configuration.nix
# nixos-install
# reboot
-
-
- NixOS Configuration
+
+
+
+
+ NixOS Configuration
{ config, pkgs, ... }: {
imports = [
@@ -438,10 +540,19 @@ $ nix-env -i w3m
services.sshd.enable = true;
}
-
-
-
-
-
-
+
+
+
+ Additional installation notes
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index b371af353cf9..46d06d71333a 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -129,17 +129,17 @@ in
message = "Option driSupport32Bit only makes sense on a 64-bit system.";
};
- system.activationScripts.setup-opengl =
- ''
- ln -sfn ${package} /run/opengl-driver
- ${if pkgs.stdenv.isi686 then ''
- ln -sfn opengl-driver /run/opengl-driver-32
- '' else if cfg.driSupport32Bit then ''
- ln -sfn ${package32} /run/opengl-driver-32
- '' else ''
- rm -f /run/opengl-driver-32
- ''}
- '';
+ systemd.tmpfiles.rules = [
+ "L+ /run/opengl-driver - - - - ${package}"
+ (
+ if pkgs.stdenv.isi686 then
+ "L+ /run/opengl-driver-32 - - - - opengl-driver"
+ else if cfg.driSupport32Bit then
+ "L+ /run/opengl-driver-32 - - - - ${package32}"
+ else
+ "r /run/opengl-driver-32"
+ )
+ ];
environment.sessionVariables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib";
diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix
new file mode 100644
index 000000000000..378aeffe71b5
--- /dev/null
+++ b/nixos/modules/hardware/steam-hardware.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.hardware.steam-hardware;
+
+in
+
+{
+ options.hardware.steam-hardware = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable udev rules for Steam hardware such as the Steam Controller, other supported controllers and the HTC Vive";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [
+ pkgs.steamPackages.steam
+ ];
+ };
+}
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eb1952280331..6944d1a4f76b 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -26,9 +26,73 @@ let
nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
enabled = nvidia_x11 != null;
+
+ cfg = config.hardware.nvidia;
+ optimusCfg = cfg.optimus_prime;
in
{
+ options = {
+ hardware.nvidia.modesetting.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enable kernel modesetting when using the NVIDIA proprietary driver.
+
+ Enabling this fixes screen tearing when using Optimus via PRIME (see
+ . This is not enabled
+ by default because it is not officially supported by NVIDIA and would not
+ work with SLI.
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME.
+ If enabled, the NVIDIA GPU will be always on and used for all rendering,
+ while enabling output to displays attached only to the integrated Intel GPU
+ without a multiplexer.
+
+ Note that this option only has any effect if the "nvidia" driver is specified
+ in , and it should preferably
+ be the only driver there.
+
+ If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
+ specified ( and
+ ).
+
+ If you enable this, you may want to also enable kernel modesetting for the
+ NVIDIA driver () in order
+ to prevent tearing.
+
+ Note that this configuration will only be successful when a display manager
+ for which the
+ option is supported is used; notably, SLiM is not supported.
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
+ type = lib.types.string;
+ default = "";
+ example = "PCI:1:0:0";
+ description = ''
+ Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
+ shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
+ type = lib.types.string;
+ default = "";
+ example = "PCI:0:2:0";
+ description = ''
+ Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
+ shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
+ '';
+ };
+ };
config = mkIf enabled {
assertions = [
@@ -36,15 +100,61 @@ in
assertion = config.services.xserver.displayManager.gdm.wayland;
message = "NVidia drivers don't support wayland";
}
+ {
+ assertion = !optimusCfg.enable ||
+ (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
+ message = ''
+ When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
+ '';
+ }
];
- services.xserver.drivers = singleton
- { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; };
+ # If Optimus/PRIME is enabled, we:
+ # - Specify the configured NVIDIA GPU bus ID in the Device section for the
+ # "nvidia" driver.
+ # - Add the AllowEmptyInitialConfiguration option to the Screen section for the
+ # "nvidia" driver, in order to allow the X server to start without any outputs.
+ # - Add a separate Device section for the Intel GPU, using the "modesetting"
+ # driver and with the configured BusID.
+ # - Reference that Device section from the ServerLayout section as an inactive
+ # device.
+ # - Configure the display manager to run specific `xrandr` commands which will
+ # configure/enable displays connected to the Intel GPU.
- services.xserver.screenSection =
+ services.xserver.drivers = singleton {
+ name = "nvidia";
+ modules = [ nvidia_x11.bin ];
+ libPath = [ nvidia_x11 ];
+ deviceSection = optionalString optimusCfg.enable
+ ''
+ BusID "${optimusCfg.nvidiaBusId}"
+ '';
+ screenSection =
+ ''
+ Option "RandRRotation" "on"
+ ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
+ '';
+ };
+
+ services.xserver.extraConfig = optionalString optimusCfg.enable
''
- Option "RandRRotation" "on"
+ Section "Device"
+ Identifier "nvidia-optimus-intel"
+ Driver "modesetting"
+ BusID "${optimusCfg.intelBusId}"
+ Option "AccelMethod" "none"
+ EndSection
'';
+ services.xserver.serverLayoutSection = optionalString optimusCfg.enable
+ ''
+ Inactive "nvidia-optimus-intel"
+ '';
+
+ services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable ''
+ # Added by nvidia configuration module for Optimus/PRIME.
+ ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
+ ${pkgs.xorg.xrandr}/bin/xrandr --auto
+ '';
environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles {
source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
@@ -62,6 +172,8 @@ in
boot.kernelModules = [ "nvidia-uvm" ] ++
lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
+ # If requested enable modesetting via kernel parameter.
+ boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
services.udev.extraRules =
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index adde237c07c9..1cfc8ff8612e 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/mxg4bbblxfns96yrz0nalxyiyjl7gj98-nix-2.1.2";
- i686-linux = "/nix/store/bgjgmbwirx63mwwychpikd7yc4k4lbjv-nix-2.1.2";
- aarch64-linux = "/nix/store/yi18azn4nwrcwvaiag04jnxc1qs38fy5-nix-2.1.2";
- x86_64-darwin = "/nix/store/fpivmcck2qpw5plrp599iraw2x9jp18k-nix-2.1.2";
+ x86_64-linux = "/nix/store/cdcia67siabmj6li7vyffgv2cry86fq8-nix-2.1.3";
+ i686-linux = "/nix/store/6q3xi6y5qnsv7d62b8n00hqfxi8rs2xs-nix-2.1.3";
+ aarch64-linux = "/nix/store/2v93d0vimlm28jg0ms6v1i6lc0fq13pn-nix-2.1.3";
+ x86_64-darwin = "/nix/store/dkjlfkrknmxbjmpfk3dg4q3nmb7m3zvk-nix-2.1.3";
}
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 359caad89a72..b70faa380e54 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -277,8 +277,7 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
# Also for Hyper-V.
if ($virt eq "microsoft") {
- push @initrdAvailableKernelModules, "hv_storvsc";
- $videoDriver = "fbdev";
+ push @attrs, "virtualisation.hypervGuest.enable = true;"
}
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 3f1e591b97b0..327e3e6989f7 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -82,7 +82,7 @@ evalNix(){
set -e
if test $exit_code -eq 0; then
- cat <&2 <services.phpfpm.phpPackage.
+ '';
+ };
+
+ phpOptions = mkOption {
+ type = types.attrsOf types.str;
+ default = {
+ "short_open_tag" = "Off";
+ "expose_php" = "Off";
+ "error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
+ "display_errors" = "stderr";
+ "opcache.enable_cli" = "1";
+ "opcache.interned_strings_buffer" = "8";
+ "opcache.max_accelerated_files" = "10000";
+ "opcache.memory_consumption" = "128";
+ "opcache.revalidate_freq" = "1";
+ "opcache.fast_shutdown" = "1";
+ "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
+ "catch_workers_output" = "yes";
+ };
+ description = ''
+ Options for PHP's php.ini file for nextcloud.
+ '';
+ };
+
+ config = {
+ dbtype = mkOption {
+ type = types.enum [ "sqlite" "pgsql" "mysql" ];
+ default = "sqlite";
+ description = "Database type.";
+ };
+ dbname = mkOption {
+ type = types.nullOr types.str;
+ default = "nextcloud";
+ description = "Database name.";
+ };
+ dbuser = mkOption {
+ type = types.nullOr types.str;
+ default = "nextcloud";
+ description = "Database user.";
+ };
+ dbpass = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Database password. Use dbpassFile to avoid this
+ being world-readable in the /nix/store.
+ '';
+ };
+ dbpassFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The full path to a file that contains the database password.
+ '';
+ };
+ dbhost = mkOption {
+ type = types.nullOr types.str;
+ default = "localhost";
+ description = "Database host.";
+ };
+ dbport = mkOption {
+ type = with types; nullOr (either int str);
+ default = null;
+ description = "Database port.";
+ };
+ dbtableprefix = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Table prefix in Nextcloud database.";
+ };
+ adminuser = mkOption {
+ type = types.str;
+ default = "root";
+ description = "Admin username.";
+ };
+ adminpass = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Database password. Use adminpassFile to avoid this
+ being world-readable in the /nix/store.
+ '';
+ };
+ adminpassFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The full path to a file that contains the admin's password.
+ '';
+ };
+
+ extraTrustedDomains = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Trusted domains, from which the nextcloud installation will be
+ acessible. You don't need to add
+ services.nextcloud.hostname here.
+ '';
+ };
+ };
+
+ caching = {
+ apcu = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to load the APCu module into PHP.
+ '';
+ };
+ redis = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to load the Redis module into PHP.
+ You still need to enable Redis in your config.php.
+ See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html
+ '';
+ };
+ memcached = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to load the Memcached module into PHP.
+ You still need to enable Memcached in your config.php.
+ See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable (mkMerge [
+ { assertions = let acfg = cfg.config; in [
+ { assertion = !(acfg.dbpass != null && acfg.dbpassFile != null);
+ message = "Please specify no more than one of dbpass or dbpassFile";
+ }
+ { assertion = ((acfg.adminpass != null || acfg.adminpassFile != null)
+ && !(acfg.adminpass != null && acfg.adminpassFile != null));
+ message = "Please specify exactly one of adminpass or adminpassFile";
+ }
+ ];
+ }
+
+ { systemd.timers."nextcloud-cron" = {
+ wantedBy = [ "timers.target" ];
+ timerConfig.OnBootSec = "5m";
+ timerConfig.OnUnitActiveSec = "15m";
+ timerConfig.Unit = "nextcloud-cron.service";
+ };
+
+ systemd.services = {
+ "nextcloud-setup" = let
+ overrideConfig = pkgs.writeText "nextcloud-config.php" ''
+ [
+ [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ],
+ [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ],
+ ],
+ 'datadirectory' => '${cfg.home}/data',
+ 'skeletondirectory' => '${cfg.skeletonDirectory}',
+ ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
+ 'log_type' => 'syslog',
+ ];
+ '';
+ occInstallCmd = let
+ c = cfg.config;
+ adminpass = if c.adminpassFile != null
+ then ''"$(<"${toString c.adminpassFile}")"''
+ else ''"${toString c.adminpass}"'';
+ dbpass = if c.dbpassFile != null
+ then ''"$(<"${toString c.dbpassFile}")"''
+ else if c.dbpass != null
+ then ''"${toString c.dbpass}"''
+ else null;
+ installFlags = concatStringsSep " \\\n "
+ (mapAttrsToList (k: v: "${k} ${toString v}") {
+ "--database" = ''"${c.dbtype}"'';
+ # The following attributes are optional depending on the type of
+ # database. Those that evaluate to null on the left hand side
+ # will be omitted.
+ ${if c.dbname != null then "--database-name" else null} = ''"${c.dbname}"'';
+ ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
+ ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
+ ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
+ ${if (any (x: x != null) [c.dbpass c.dbpassFile])
+ then "--database-pass" else null} = dbpass;
+ ${if c.dbtableprefix != null
+ then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
+ "--admin-user" = ''"${c.adminuser}"'';
+ "--admin-pass" = adminpass;
+ "--data-dir" = ''"${cfg.home}/data"'';
+ });
+ in ''
+ ${occ}/bin/nextcloud-occ maintenance:install \
+ ${installFlags}
+ '';
+ occSetTrustedDomainsCmd = concatStringsSep "\n" (imap0
+ (i: v: ''
+ ${occ}/bin/nextcloud-occ config:system:set trusted_domains \
+ ${toString i} --value="${toString v}"
+ '') ([ cfg.hostName ] ++ cfg.config.extraTrustedDomains));
+
+ in {
+ wantedBy = [ "multi-user.target" ];
+ before = [ "phpfpm-nextcloud.service" ];
+ script = ''
+ chmod og+x ${cfg.home}
+ ln -sf ${pkgs.nextcloud}/apps ${cfg.home}/
+ mkdir -p ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps
+ ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php
+
+ chown -R nextcloud:nginx ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps
+
+ # Do not install if already installed
+ if [[ ! -e ${cfg.home}/config/config.php ]]; then
+ ${occInstallCmd}
+ fi
+
+ ${occ}/bin/nextcloud-occ upgrade
+
+ ${occ}/bin/nextcloud-occ config:system:delete trusted_domains
+ ${occSetTrustedDomainsCmd}
+ '';
+ serviceConfig.Type = "oneshot";
+ };
+ "nextcloud-cron" = {
+ environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
+ serviceConfig.Type = "oneshot";
+ serviceConfig.User = "nextcloud";
+ serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php";
+ };
+ };
+
+ services.phpfpm = {
+ phpOptions = phpOptionsExtensions;
+ phpPackage = pkgs.php71;
+ pools.nextcloud = let
+ phpAdminValues = (toKeyValue
+ (foldr (a: b: a // b) {}
+ (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
+ phpOptions)));
+ in {
+ listen = "/run/phpfpm/nextcloud";
+ extraConfig = ''
+ listen.owner = nginx
+ listen.group = nginx
+ user = nextcloud
+ group = nginx
+ pm = dynamic
+ pm.max_children = 32
+ pm.start_servers = 2
+ pm.min_spare_servers = 2
+ pm.max_spare_servers = 4
+ env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config
+ env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin
+ ${phpAdminValues}
+ '';
+ };
+ };
+
+ users.extraUsers.nextcloud = {
+ home = "${cfg.home}";
+ group = "nginx";
+ createHome = true;
+ };
+
+ environment.systemPackages = [ occ ];
+ }
+
+ (mkIf cfg.nginx.enable {
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ "${cfg.hostName}" = {
+ root = pkgs.nextcloud;
+ locations = {
+ "= /robots.txt" = {
+ priority = 100;
+ extraConfig = ''
+ allow all;
+ log_not_found off;
+ access_log off;
+ '';
+ };
+ "/" = {
+ priority = 200;
+ extraConfig = "rewrite ^ /index.php$uri;";
+ };
+ "~ ^/store-apps" = {
+ priority = 201;
+ extraConfig = "root ${cfg.home};";
+ };
+ "= /.well-known/carddav" = {
+ priority = 210;
+ extraConfig = "return 301 $scheme://$host/remote.php/dav;";
+ };
+ "= /.well-known/caldav" = {
+ priority = 210;
+ extraConfig = "return 301 $scheme://$host/remote.php/dav;";
+ };
+ "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/" = {
+ priority = 300;
+ extraConfig = "deny all;";
+ };
+ "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = {
+ priority = 300;
+ extraConfig = "deny all;";
+ };
+ "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = {
+ priority = 500;
+ extraConfig = ''
+ include ${pkgs.nginxMainline}/conf/fastcgi.conf;
+ fastcgi_split_path_info ^(.+\.php)(/.*)$;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param HTTPS ${if cfg.https then "on" else "off"};
+ fastcgi_param modHeadersAvailable true;
+ fastcgi_param front_controller_active true;
+ fastcgi_pass unix:/run/phpfpm/nextcloud;
+ fastcgi_intercept_errors on;
+ fastcgi_request_buffering off;
+ fastcgi_read_timeout 120s;
+ '';
+ };
+ "~ ^/(?:updater|ocs-provider)(?:$|/)".extraConfig = ''
+ try_files $uri/ =404;
+ index index.php;
+ '';
+ "~ \\.(?:css|js|woff|svg|gif)$".extraConfig = ''
+ try_files $uri /index.php$uri$is_args$args;
+ add_header Cache-Control "public, max-age=15778463";
+ add_header X-Content-Type-Options nosniff;
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+ add_header X-Download-Options noopen;
+ add_header X-Permitted-Cross-Domain-Policies none;
+ access_log off;
+ '';
+ "~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = ''
+ try_files $uri /index.php$uri$is_args$args;
+ access_log off;
+ '';
+ };
+ extraConfig = ''
+ add_header X-Content-Type-Options nosniff;
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Robots-Tag none;
+ add_header X-Download-Options noopen;
+ add_header X-Permitted-Cross-Domain-Policies none;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+ client_max_body_size ${cfg.maxUploadSize};
+ fastcgi_buffers 64 4K;
+ gzip on;
+ gzip_vary on;
+ gzip_comp_level 4;
+ gzip_min_length 256;
+ gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
+ gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+
+ ${optionalString cfg.webfinger ''
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+ ''}
+ '';
+ };
+ };
+ };
+ })
+ ]);
+}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b231ee5a3f01..508398f03ace 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -245,8 +245,8 @@ let
}
''
) virtualHosts);
- mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
- location ${location} {
+ mkLocations = locations: concatStringsSep "\n" (map (config: ''
+ location ${config.location} {
${optionalString (config.proxyPass != null && !cfg.proxyResolveWhileRunning)
"proxy_pass ${config.proxyPass};"
}
@@ -266,7 +266,18 @@ let
${config.extraConfig}
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
}
- '') locations);
+ '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
+ mkBasicAuth = vhostName: authDef: let
+ htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" (
+ concatStringsSep "\n" (mapAttrsToList (user: password: ''
+ ${user}:{PLAIN}${password}
+ '') authDef)
+ );
+ in ''
+ auth_basic secured;
+ auth_basic_user_file ${htpasswdFile};
+ '';
+
mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
concatStringsSep "\n" (mapAttrsToList (user: password: ''
${user}:{PLAIN}${password}
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 4c772734a749..9b44433d3845 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -71,6 +71,16 @@ with lib;
These lines go to the end of the location verbatim.
'';
};
+
+ priority = mkOption {
+ type = types.int;
+ default = 1000;
+ description = ''
+ Order of this location block in relation to the others in the vhost.
+ The semantics are the same as with `lib.mkOrder`. Smaller values have
+ a greater priority.
+ '';
+ };
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 706555921454..11c1aa4315a8 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -64,7 +64,7 @@ in
};
security.wrappers = {
- kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
+ kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/lib/libexec/kcheckpass";
"start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 357fa8ce8f36..26b79730dd38 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -222,6 +222,17 @@ in
description = "List of arguments for the X server.";
};
+ setupCommands = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Shell commands executed just after the X server has started.
+
+ This option is only effective for display managers for which this feature
+ is supported; currently these are LightDM, GDM and SDDM.
+ '';
+ };
+
sessionCommands = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a775dd0f0e04..6cc30b218f4a 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -7,6 +7,13 @@ let
cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome3.gdm;
+ xSessionWrapper = if (cfg.setupCommands == "") then null else
+ pkgs.writeScript "gdm-x-session-wrapper" ''
+ #!${pkgs.bash}/bin/bash
+ ${cfg.setupCommands}
+ exec "$@"
+ '';
+
in
{
@@ -112,6 +119,11 @@ in
GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions";
# Find the mouse
XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
+ } // optionalAttrs (xSessionWrapper != null) {
+ # Make GDM use this wrapper before running the session, which runs the
+ # configured setupCommands. This relies on a patched GDM which supports
+ # this environment variable.
+ GDM_X_SESSION_WRAPPER = "${xSessionWrapper}";
};
execCmd = "exec ${gdm}/bin/gdm";
};
@@ -142,7 +154,10 @@ in
systemd.user.services.dbus.wantedBy = [ "default.target" ];
- programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
+ programs.dconf.profiles.gdm = pkgs.writeText "dconf-gdm-profile" ''
+ system-db:local
+ ${gdm}/share/dconf/profile/gdm
+ '';
# Use AutomaticLogin if delay is zero, because it's immediate.
# Otherwise with TimedLogin with zero seconds the prompt is still
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 8078b93a7574..16f1ddea1a75 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -46,6 +46,7 @@ let
greeters-directory = ${cfg.greeter.package}
''}
sessions-directory = ${dmcfg.session.desktops}/share/xsessions
+ ${cfg.extraConfig}
[Seat:*]
xserver-command = ${xserverWrapper}
@@ -61,6 +62,12 @@ let
${optionalString hasDefaultUserSession ''
user-session=${defaultSessionName}
''}
+ ${optionalString (dmcfg.setupCommands != "") ''
+ display-setup-script=${pkgs.writeScript "lightdm-display-setup" ''
+ #!${pkgs.bash}/bin/bash
+ ${dmcfg.setupCommands}
+ ''}
+ ''}
${cfg.extraSeatDefaults}
'';
@@ -113,6 +120,15 @@ in
};
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ user-authority-in-system-dir = true
+ '';
+ description = "Extra lines to append to LightDM section.";
+ };
+
background = mkOption {
type = types.str;
default = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png";
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 2a9826177737..522a0dc92d6f 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -20,6 +20,7 @@ let
Xsetup = pkgs.writeScript "Xsetup" ''
#!/bin/sh
${cfg.setupScript}
+ ${dmcfg.setupCommands}
'';
Xstop = pkgs.writeScript "Xstop" ''
@@ -137,7 +138,8 @@ in
xrandr --auto
'';
description = ''
- A script to execute when starting the display server.
+ A script to execute when starting the display server. DEPRECATED, please
+ use .
'';
};
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 75bfeaac1fa3..297e36311656 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -374,6 +374,12 @@ in
description = "Contents of the first Monitor section of the X server configuration file.";
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Additional contents (sections) included in the X server configuration file";
+ };
+
xrandrHeads = mkOption {
default = [];
example = [
@@ -754,6 +760,7 @@ in
Driver "${driver.driverName or driver.name}"
${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
${cfg.deviceSection}
+ ${driver.deviceSection or ""}
${xrandrDeviceSection}
EndSection
@@ -765,6 +772,7 @@ in
''}
${cfg.screenSection}
+ ${driver.screenSection or ""}
${optionalString (cfg.defaultDepth != 0) ''
DefaultDepth ${toString cfg.defaultDepth}
@@ -794,6 +802,8 @@ in
'')}
${xrandrMonitorSections}
+
+ ${cfg.extraConfig}
'';
fonts.enableDefaultFonts = mkDefault true;
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 5a87a2ec7623..b1eaf0189562 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -174,14 +174,6 @@ in
''
# Various log/runtime directories.
- mkdir -m 0755 -p /run/nix/current-load # for distributed builds
- mkdir -m 0700 -p /run/nix/remote-stores
-
- mkdir -m 0755 -p /var/log
-
- touch /var/log/wtmp /var/log/lastlog # must exist
- chmod 644 /var/log/wtmp /var/log/lastlog
-
mkdir -m 1777 -p /var/tmp
# Empty, immutable home directory of many system accounts.
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index a9824649e387..397b308b7311 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -419,8 +419,8 @@ while (my $f = <$listActiveUsers>) {
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";
- system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
- system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
+ system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+ system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
}
close $listActiveUsers;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 413543df88c6..a560af5ce96d 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -109,6 +109,7 @@ let
inherit (pkgs) utillinux coreutils;
systemd = config.systemd.package;
shell = "${pkgs.bash}/bin/sh";
+ su = "${pkgs.shadow.su}/bin/su";
inherit children;
kernelParams = config.boot.kernelParams;
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 49764b75a557..03daafa1ce4f 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -152,6 +152,14 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
@shell@ @postBootCommands@
+# Ensure systemd doesn't try to populate /etc, by forcing its first-boot
+# heuristic off. It doesn't matter what's in /etc/machine-id for this purpose,
+# and systemd will immediately fill in the file when it starts, so just
+# creating it is enough. This `: >>` pattern avoids forking and avoids changing
+# the mtime if the file already exists.
+: >> /etc/machine-id
+
+
# Reset the logging file descriptors.
exec 1>&$logOutFd 2>&$logErrFd
exec {logOutFd}>&- {logErrFd}>&-
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 2cff25a8c854..5f2bec5c34ae 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -394,7 +394,7 @@ in rec {
Each attribute in this set specifies an option in the
[Timer] section of the unit. See
systemd.timer
- 7 and
+ 5 and
systemd.time
7 for details.
'';
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3ac4c02b61f5..a1412bc32904 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -747,6 +747,7 @@ in
"systemd/journald.conf".text = ''
[Journal]
+ Storage=persistent
RateLimitInterval=${config.services.journald.rateLimitInterval}
RateLimitBurst=${toString config.services.journald.rateLimitBurst}
${optionalString (config.services.journald.console != "") ''
@@ -783,19 +784,6 @@ in
services.dbus.enable = true;
- system.activationScripts.systemd = stringAfter [ "groups" ]
- ''
- mkdir -m 0755 -p /var/lib/udev
-
- if ! [ -e /etc/machine-id ]; then
- ${systemd}/bin/systemd-machine-id-setup
- fi
-
- # Keep a persistent journal. Note that systemd-tmpfiles will
- # set proper ownership/permissions.
- mkdir -m 0700 -p /var/log/journal
- '';
-
users.users.systemd-network.uid = config.ids.uids.systemd-network;
users.groups.systemd-network.gid = config.ids.gids.systemd-network;
users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve;
diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
index ecd2a8117710..0f1f052880c5 100644
--- a/nixos/modules/virtualisation/hyperv-guest.nix
+++ b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -9,20 +9,47 @@ in {
options = {
virtualisation.hypervGuest = {
enable = mkEnableOption "Hyper-V Guest Support";
+
+ videoMode = mkOption {
+ type = types.str;
+ default = "1152x864";
+ example = "1024x768";
+ description = ''
+ Resolution at which to initialize the video adapter.
+
+ Supports screen resolution up to Full HD 1920x1080 with 32 bit color
+ on Windows Server 2012, and 1600x1200 with 16 bit color on Windows
+ Server 2008 R2 or earlier.
+ '';
+ };
};
};
config = mkIf cfg.enable {
+ boot = {
+ initrd.kernelModules = [
+ "hv_balloon" "hv_netvsc" "hv_storvsc" "hv_utils" "hv_vmbus"
+ ];
+
+ kernelParams = [
+ "video=hyperv_fb:${cfg.videoMode}"
+ ];
+ };
+
environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ];
security.rngd.enable = false;
- # enable hotadding memory
+ # enable hotadding cpu/memory
services.udev.packages = lib.singleton (pkgs.writeTextFile {
- name = "hyperv-memory-hotadd-udev-rules";
- destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules";
+ name = "hyperv-cpu-and-memory-hotadd-udev-rules";
+ destination = "/etc/udev/rules.d/99-hyperv-cpu-and-memory-hotadd.rules";
text = ''
- ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online"
+ # Memory hotadd
+ SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory[0-9]*", TEST=="state", ATTR{state}="online"
+
+ # CPU hotadd
+ SUBSYSTEM=="cpu", ACTION=="add", DEVPATH=="/devices/system/cpu/cpu[0-9]*", TEST=="online", ATTR{online}="1"
'';
});
diff --git a/nixos/release.nix b/nixos/release.nix
index e53ebff9b6dc..66dbf697c8a0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -362,6 +362,7 @@ in rec {
tests.netdata = callTest tests/netdata.nix { };
tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
+ tests.nextcloud = callSubTests tests/nextcloud { };
# TODO: put in networking.nix after the test becomes more complete
tests.networkingProxy = callTest tests/networking-proxy.nix {};
tests.nexus = callTest tests/nexus.nix { };
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 6d72ac997f8d..3ad55651b112 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -78,6 +78,8 @@ import ./make-test.nix ({ pkgs, ...} : rec {
# Test whether we have a reboot record in wtmp.
subtest "reboot-wtmp", sub {
+ $machine->shutdown;
+ $machine->waitForUnit('multi-user.target');
$machine->succeed("last | grep reboot >&2");
};
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
new file mode 100644
index 000000000000..c3b710f0f904
--- /dev/null
+++ b/nixos/tests/nextcloud/basic.nix
@@ -0,0 +1,56 @@
+import ../make-test.nix ({ pkgs, ...}: let
+ adminpass = "notproduction";
+ adminuser = "root";
+in {
+ name = "nextcloud-basic";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ globin eqyiel ];
+ };
+
+ nodes = {
+ # The only thing the client needs to do is download a file.
+ client = { ... }: {};
+
+ nextcloud = { config, pkgs, ... }: {
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
+ services.nextcloud = {
+ enable = true;
+ nginx.enable = true;
+ hostName = "nextcloud";
+ config = {
+ # Don't inherit adminuser since "root" is supposed to be the default
+ inherit adminpass;
+ };
+ };
+ };
+ };
+
+ testScript = let
+ withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+ #!${pkgs.stdenv.shell}
+ export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+ export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+ export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+ export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+ export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+ "''${@}"
+ '';
+ copySharedFile = pkgs.writeScript "copy-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ echo 'hi' | ${withRcloneEnv} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+ '';
+
+ diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+ '';
+ in ''
+ startAll();
+ $nextcloud->waitForUnit("multi-user.target");
+ $nextcloud->succeed("curl -sSf http://nextcloud/login");
+ $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+ $client->waitForUnit("multi-user.target");
+ $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+ '';
+})
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
new file mode 100644
index 000000000000..66da6794b961
--- /dev/null
+++ b/nixos/tests/nextcloud/default.nix
@@ -0,0 +1,6 @@
+{ system ? builtins.currentSystem }:
+{
+ basic = import ./basic.nix { inherit system; };
+ with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system; };
+ with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system; };
+}
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
new file mode 100644
index 000000000000..c0d347238b47
--- /dev/null
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -0,0 +1,97 @@
+import ../make-test.nix ({ pkgs, ...}: let
+ adminpass = "hunter2";
+ adminuser = "root";
+in {
+ name = "nextcloud-with-mysql-and-memcached";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ nodes = {
+ # The only thing the client needs to do is download a file.
+ client = { ... }: {};
+
+ nextcloud = { config, pkgs, ... }: {
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
+ services.nextcloud = {
+ enable = true;
+ hostName = "nextcloud";
+ nginx.enable = true;
+ https = true;
+ caching = {
+ apcu = true;
+ redis = false;
+ memcached = true;
+ };
+ config = {
+ dbtype = "mysql";
+ dbname = "nextcloud";
+ dbuser = "nextcloud";
+ dbhost = "127.0.0.1";
+ dbport = 3306;
+ dbpass = "hunter2";
+ # Don't inherit adminuser since "root" is supposed to be the default
+ inherit adminpass;
+ };
+ };
+
+ services.mysql = {
+ enable = true;
+ bind = "127.0.0.1";
+ package = pkgs.mariadb;
+ initialScript = pkgs.writeText "mysql-init" ''
+ CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'hunter2';
+ CREATE DATABASE IF NOT EXISTS nextcloud;
+ GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
+ CREATE TEMPORARY TABLES ON nextcloud.* TO 'nextcloud'@'localhost'
+ IDENTIFIED BY 'hunter2';
+ FLUSH privileges;
+ '';
+ };
+
+ systemd.services."nextcloud-setup"= {
+ requires = ["mysql.service"];
+ after = ["mysql.service"];
+ };
+
+ services.memcached.enable = true;
+ };
+ };
+
+ testScript = let
+ configureMemcached = pkgs.writeScript "configure-memcached" ''
+ #!${pkgs.stdenv.shell}
+ nextcloud-occ config:system:set memcached_servers 0 0 --value 127.0.0.1 --type string
+ nextcloud-occ config:system:set memcached_servers 0 1 --value 11211 --type integer
+ nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\APCu' --type string
+ nextcloud-occ config:system:set memcache.distributed --value '\OC\Memcache\Memcached' --type string
+ '';
+ withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+ #!${pkgs.stdenv.shell}
+ export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+ export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+ export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+ export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+ export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+ '';
+ copySharedFile = pkgs.writeScript "copy-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+ '';
+
+ diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+ '';
+ in ''
+ startAll();
+ $nextcloud->waitForUnit("multi-user.target");
+ $nextcloud->succeed("${configureMemcached}");
+ $nextcloud->succeed("curl -sSf http://nextcloud/login");
+ $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+ $client->waitForUnit("multi-user.target");
+ $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+
+ '';
+})
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
new file mode 100644
index 000000000000..0351d4db69ac
--- /dev/null
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -0,0 +1,130 @@
+import ../make-test.nix ({ pkgs, ...}: let
+ adminpass = "hunter2";
+ adminuser = "custom-admin-username";
+in {
+ name = "nextcloud-with-postgresql-and-redis";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ nodes = {
+ # The only thing the client needs to do is download a file.
+ client = { ... }: {};
+
+ nextcloud = { config, pkgs, ... }: {
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
+ services.nextcloud = {
+ enable = true;
+ hostName = "nextcloud";
+ nginx.enable = true;
+ caching = {
+ apcu = false;
+ redis = true;
+ memcached = false;
+ };
+ config = {
+ dbtype = "pgsql";
+ dbname = "nextcloud";
+ dbuser = "nextcloud";
+ dbhost = "localhost";
+ dbpassFile = toString (pkgs.writeText "db-pass-file" ''
+ hunter2
+ '');
+ inherit adminuser;
+ adminpassFile = toString (pkgs.writeText "admin-pass-file" ''
+ ${adminpass}
+ '');
+ };
+ };
+
+ services.redis = {
+ unixSocket = "/var/run/redis/redis.sock";
+ enable = true;
+ extraConfig = ''
+ unixsocketperm 770
+ '';
+ };
+
+ systemd.services.redis = {
+ preStart = ''
+ mkdir -p /var/run/redis
+ chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis
+ '';
+ serviceConfig.PermissionsStartOnly = true;
+ };
+
+ systemd.services."nextcloud-setup"= {
+ requires = ["postgresql.service"];
+ after = [
+ "postgresql.service"
+ "chown-redis-socket.service"
+ ];
+ };
+
+ # At the time of writing, redis creates its socket with the "nobody"
+ # group. I figure this is slightly less bad than making the socket world
+ # readable.
+ systemd.services."chown-redis-socket" = {
+ enable = true;
+ script = ''
+ until ${pkgs.redis}/bin/redis-cli ping; do
+ echo "waiting for redis..."
+ sleep 1
+ done
+ chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis/redis.sock
+ '';
+ after = [ "redis.service" ];
+ requires = [ "redis.service" ];
+ wantedBy = [ "redis.service" ];
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+
+ services.postgresql = {
+ enable = true;
+ initialScript = pkgs.writeText "psql-init" ''
+ create role nextcloud with login password 'hunter2';
+ create database nextcloud with owner nextcloud;
+ '';
+ };
+ };
+ };
+
+ testScript = let
+ configureRedis = pkgs.writeScript "configure-redis" ''
+ #!${pkgs.stdenv.shell}
+ nextcloud-occ config:system:set redis 'host' --value '/var/run/redis/redis.sock' --type string
+ nextcloud-occ config:system:set redis 'port' --value 0 --type integer
+ nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string
+ nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string
+ '';
+ withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+ #!${pkgs.stdenv.shell}
+ export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+ export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+ export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+ export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+ export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+ "''${@}"
+ '';
+ copySharedFile = pkgs.writeScript "copy-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+ '';
+
+ diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+ #!${pkgs.stdenv.shell}
+ diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+ '';
+ in ''
+ startAll();
+ $nextcloud->waitForUnit("multi-user.target");
+ $nextcloud->succeed("${configureRedis}");
+ $nextcloud->succeed("curl -sSf http://nextcloud/login");
+ $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+ $client->waitForUnit("multi-user.target");
+ $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+ '';
+})
diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix
index aa366d8612d7..494d55121eb1 100644
--- a/nixos/tests/nix-ssh-serve.nix
+++ b/nixos/tests/nix-ssh-serve.nix
@@ -14,8 +14,8 @@ in
keys = [ snakeOilPublicKey ];
protocol = "ssh-ng";
};
- server.nix.package = pkgs.nixUnstable;
- client.nix.package = pkgs.nixUnstable;
+ server.nix.package = pkgs.nix;
+ client.nix.package = pkgs.nix;
};
testScript = ''
startAll;
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index dc463f386582..c266fa2fef25 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,20 +1,21 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq
-, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.16.3";
+ version = "0.17.0";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
- sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
+ sha256 = "0pkq28d2dj22qrxyyg9kh0whmhj7ghyabnhyqldbljv4a7l3kvwq";
};
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook ]
+ ++ optionals doCheck [ python3 ];
buildInputs = [ openssl db48 boost zlib zeromq
miniupnpc protobuf libevent]
++ optionals stdenv.isLinux [ utillinux ]
@@ -30,9 +31,11 @@ stdenv.mkDerivation rec{
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];
- # Fails with "This application failed to start because it could not
- # find or load the Qt platform plugin "minimal""
- doCheck = false;
+ doCheck = true;
+
+ # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+ # See also https://github.com/NixOS/nixpkgs/issues/24256
+ checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 4667d4029878..3426d8d07a08 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "nano-wallet-${version}";
- version = "16.0";
+ version = "16.1";
src = fetchFromGitHub {
owner = "nanocurrency";
repo = "raiblocks";
rev = "V${version}";
- sha256 = "0fk8jlas3khdh3nlv40krsjdifxp9agblvzap6k93wmm9y34h41c";
+ sha256 = "0sk9g4fv494a5w75vs5a3s5c139lxzz1svz0cn1hkhxqlmz8w081";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index f3bcff7a2c51..e61b9d8b290d 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
};
diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
index 2d35ebb41aee..00e10a2ff1e2 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
mkDerivation rec {
name = "elisa-${version}";
- version = "0.2.80";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
- sha256 = "0wc2kkp28gp1rfgg14a769lalwd44yz7jxkrzanh91v5j2kkln07";
+ sha256 = "0bpkr5rp9nfa2wzm6w3xkhsfgf5dbgxbmhckjh9wkxal3mncpkg4";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index 88b636679cbd..db70e59218b3 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
+{ stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
, vorbis-tools }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "mhwaveedit-${version}";
- version = "1.4.23";
+ version = "1.4.24";
- src = fetchurl {
- url = "https://github.com/magnush/mhwaveedit/archive/v${version}.tar.gz";
- sha256 = "1lvd54d8kpxwl4gihhznx1b5skhibz4vfxi9k2kwqg808jfgz37l";
+ src = fetchFromGitHub {
+ owner = "magnush";
+ repo = "mhwaveedit";
+ rev = "v${version}";
+ sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
preAutoreconf = "(cd docgen && sh gendocs.sh)";
buildInputs = [
- SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
- pkgconfig libpulseaudio makeWrapper
+ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio
];
configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ];
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Graphical program for editing, playing and recording sound files";
- homepage = https://gna.org/projects/mhwaveedit;
+ homepage = https://github.com/magnush/mhwaveedit;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index b055a520be04..f7463207045d 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
- version = "4.3.5";
+ version = "4.3.7";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "01jxkz4s3m8cqsn6wcbrw7bzr7sr7hqsp9950018riilpni7k4bd";
+ sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 354b7c4b6c7b..6ade9042b532 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "puredata-${version}";
- version = "0.48-2";
+ version = "0.49-0";
src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
- sha256 = "0p86hncgzkrl437v2wch2fg9iyn6mnrgbn811sh9pwmrjj2f06v8";
+ sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j";
};
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
@@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
"--enable-jack"
"--enable-fftw"
"--disable-portaudio"
+ "--disable-oss"
];
- # https://github.com/pure-data/pure-data/issues/188
- # --disable-oss
-
postInstall = ''
wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
'';
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index 8dab9e32f982..968c5edae63a 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
};
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index f402721e180d..5679a4d53422 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec{
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
};
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix
new file mode 100644
index 000000000000..faa90e684aea
--- /dev/null
+++ b/pkgs/applications/audio/zita-njbridge/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, libjack2, zita-resampler }:
+
+stdenv.mkDerivation rec {
+ version = "0.4.4";
+ name = "zita-njbridge-${version}";
+
+ src = fetchurl {
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
+ };
+
+ buildInputs = [ libjack2 zita-resampler ];
+
+ preConfigure = ''
+ cd ./source/
+ '';
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "MANDIR=$(out)"
+ "SUFFIX=''"
+ ];
+
+
+ meta = with stdenv.lib; {
+ description = "command line Jack clients to transmit full quality multichannel audio over a local IP network";
+ homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 682c1c0a6e7e..051078e1f5a1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
};
betaVersion = stableVersion;
latestVersion = { # canary & dev
- version = "3.3.0.11"; # "Android Studio 3.3 Canary 12"
- build = "182.5026711";
- sha256Hash = "0k1f8yw3gdil78iqxlwhbz71w1307hwwf8z9m7hs0v9b4ri6x2wk";
+ version = "3.3.0.12"; # "Android Studio 3.3 Canary 13"
+ build = "182.5035453";
+ sha256Hash = "0f2glxm41ci016dv9ygr12s72lc5mh0zsxhpmx0xswg9mdwrvwa7";
};
in rec {
# Old alias
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 1c40b509bfe4..104206a14913 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fltk13, ghostscript, xlibs }:
+{ stdenv, fetchurl, fltk13, ghostscript }:
stdenv.mkDerivation rec {
name = "flpsed-${version}";
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index fcf279095051..9e890e172e55 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05";
};
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 38996008f46f..be20800cde29 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, unzip, libsecret
+, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:
{ name, product, version, src, wmClass, jdk, meta }:
@@ -67,6 +67,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret
+ libnotify
]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9bf80b050a86..23ecfb0c19d3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -130,7 +130,8 @@ let
longDescription = ''
IDE for Java SE, Groovy & Scala development Powerful
environment for building Google Android apps Integration
- with JUnit, TestNG, popular SCMs, Ant & Maven.
+ with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
+ as IntelliJ.
'';
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 93f1639107ee..fb670d59bd12 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "1.1.6";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
- sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s";
+ sha256 = "15apv81c5h17ljrxvm7hlyqg5bw58dzgik8gfhmh97wpwnbz1bl9";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 1ebc2f88ec5d..be572ca32f9b 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n";
};
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 66a423238b34..8105f4d61bd8 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
# plugins
keepkey
trezor
+ btchip
];
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 95754579c487..537627a10d2d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -41,10 +41,10 @@ python3Packages.buildPythonApplication rec {
# plugins
keepkey
trezor
+ btchip
# TODO plugins
# amodem
- # btchip
];
preBuild = ''
diff --git a/pkgs/applications/misc/fllog/default.nix b/pkgs/applications/misc/fllog/default.nix
new file mode 100644
index 000000000000..348b1155e41e
--- /dev/null
+++ b/pkgs/applications/misc/fllog/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.2.5";
+ pname = "fllog";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ sha256 = "042j1g035338vfbl4i9laai8af8iakavar05xn2m4p7ww6x76zzl";
+ };
+
+ buildInputs = [
+ fltk13
+ libjpeg
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ meta = {
+ description = "Digital modem log program";
+ homepage = https://sourceforge.net/projects/fldigi/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ dysinger ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/flmsg/default.nix b/pkgs/applications/misc/flmsg/default.nix
new file mode 100644
index 000000000000..afdf0f91a910
--- /dev/null
+++ b/pkgs/applications/misc/flmsg/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ version = "4.0.7";
+ pname = "flmsg";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw";
+ };
+
+ buildInputs = [
+ fltk13
+ libjpeg
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ meta = {
+ description = "Digital modem message program";
+ homepage = https://sourceforge.net/projects/fldigi/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ dysinger ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix
new file mode 100644
index 000000000000..baee3010d696
--- /dev/null
+++ b/pkgs/applications/misc/flrig/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.3.40";
+ pname = "flrig";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9";
+ };
+
+ buildInputs = [
+ fltk13
+ libjpeg
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ meta = {
+ description = "Digital modem rig control program";
+ homepage = https://sourceforge.net/projects/fldigi/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ dysinger ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/flwrap/default.nix b/pkgs/applications/misc/flwrap/default.nix
new file mode 100644
index 000000000000..b96f3c2b3278
--- /dev/null
+++ b/pkgs/applications/misc/flwrap/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.3.5";
+ pname = "flwrap";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg";
+ };
+
+ buildInputs = [
+ fltk13
+ libjpeg
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ meta = {
+ description = "Digital modem file transfer program";
+ homepage = https://sourceforge.net/projects/fldigi/;
+ license = stdenv.lib.licenses.gpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ dysinger ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index dc70747784cf..0dfeac3cf8b2 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "girara-${version}";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchurl {
url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
- sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
+ sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index f99344b83d64..0f7a89b3c525 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
};
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index f63ffa091a07..977bd5e50ddd 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -11,22 +11,22 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
- gollum (4.1.3)
+ gollum (4.1.4)
gemojione (~> 3.2)
- gollum-lib (>= 4.2.9)
+ gollum-lib (~> 4.2, >= 4.2.10)
kramdown (~> 1.9.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.16.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- gollum-lib (4.2.9)
+ gollum-lib (4.2.10)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 2.1)
- sanitize (~> 2.1)
+ sanitize (~> 2.1.1, >= 2.1.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
json (2.1.0)
@@ -43,7 +43,7 @@ GEM
rack-protection (1.5.5)
rack
rouge (2.2.1)
- sanitize (2.1.0)
+ sanitize (2.1.1)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
rack (~> 1.5)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 1b3cda168ac2..3413b6ba6310 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -45,10 +45,10 @@
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6";
+ sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7";
type = "gem";
};
- version = "4.1.3";
+ version = "4.1.4";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
@@ -63,10 +63,10 @@
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj";
+ sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.10";
};
json = {
source = {
@@ -163,10 +163,10 @@
dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+ sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898";
type = "gem";
};
- version = "2.1.0";
+ version = "2.1.1";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 35c3c9748492..8ec4e7f06d16 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -41,7 +41,7 @@ in with python.pkgs; buildPythonApplication rec {
];
postInstall = ''
- install -D misc/zsh/_khard $out/share/zsh/site-functions/
+ install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard
'';
# Fails; but there are no tests anyway.
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 70b580cd0f8a..4febac10806f 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -7,7 +7,7 @@
with python3Packages;
buildPythonApplication rec {
- version = "0.12.0";
+ version = "0.12.3";
name = "kitty-${version}";
format = "other";
@@ -15,7 +15,7 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm";
+ sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c";
};
buildInputs = [
@@ -33,8 +33,8 @@ buildPythonApplication rec {
--replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
substituteInPlace docs/Makefile \
- --replace 'python3 .. +launch $(shell which sphinx-build)' \
- 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)'
+ --replace 'python3 .. +launch :sphinx-build' \
+ 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere sphinx-build'
'';
buildPhase = ''
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index b16507c8b7bd..314f8bcece10 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -2,14 +2,14 @@
, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
}:
-let version = "0.3.1"; in
+let version = "0.3.2"; in
stdenv.mkDerivation rec {
name = "lxterminal-${version}";
src = fetchurl {
url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
- sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c";
+ sha256 = "1iafqmccsm3nnzwp6pb2c04iniqqnscj83bq1rvf58ppzk0bvih3";
};
configureFlags = [
diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
new file mode 100644
index 000000000000..80b9ebf4d571
--- /dev/null
+++ b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
@@ -0,0 +1,43 @@
+From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001
+From: Keshav Kini
+Date: Thu, 9 Aug 2018 18:36:15 -0700
+Subject: [PATCH] Use `rm` from PATH
+
+On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm`
+command will generally be available in one's path when running shell
+scripts. Here, I change a couple of invocations of `/bin/rm` into
+invocations of `rm` to deal with this issue.
+
+Since `rm` is already called elsewhere in the script without an
+absolute path, I assume this change will not cause any
+regressions. Still, I've tested this on a CentOS machine and a NixOS
+machine, though not other platforms.
+---
+ makeself-header.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/makeself-header.sh b/makeself-header.sh
+index 4d2c005..2babf34 100755
+--- a/makeself-header.sh
++++ b/makeself-header.sh
+@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then
+ fi
+ res=3
+ if test x"\$keep" = xn; then
+- trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15
++ trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15
+ fi
+
+ if test x"\$nodiskspace" = xn; then
+@@ -581,7 +581,7 @@ if test x"\$script" != x; then
+ fi
+ if test x"\$keep" = xn; then
+ cd "\$TMPROOT"
+- /bin/rm -rf "\$tmpdir"
++ rm -rf "\$tmpdir"
+ fi
+ eval \$finish; exit \$res
+ EOF
+--
+2.14.1
+
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a9ec2760e8ad..a6af1762e289 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n";
};
- patchPhase = ''
+ # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd
+ patches = [ ./Use-rm-from-PATH.patch ];
+
+ postPatch = ''
sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
'';
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 199fa3e9bfe9..0dfc4b2bc58e 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgconfig, fetchurl, buildPythonApplication
+{ stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobjectIntrospection
, intltool, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll
@@ -7,7 +7,6 @@
, speechd, brltty, setproctitle, gst_all_1, gst-python
}:
-with lib;
let
pname = "orca";
version = "3.28.2";
@@ -17,7 +16,7 @@ in buildPythonApplication rec {
format = "other";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q";
};
@@ -54,7 +53,7 @@ in buildPythonApplication rec {
};
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Orca;
description = "Screen reader";
longDescription = ''
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index efaf986a9e54..f8340b1bd227 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
-, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
+{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses
+, libXft, conf ? null, patches ? [], extraLibs ? []}:
with stdenv.lib;
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- nativeBuildInputs = [ pkgconfig makeWrapper ];
- buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
+ nativeBuildInputs = [ pkgconfig ncurses ];
+ buildInputs = [ libX11 libXft ] ++ extraLibs;
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
- wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
'';
meta = {
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 292e4e5ba38b..4306c4fe9559 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "xterm-335";
+ name = "xterm-337";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
];
- sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0";
+ sha256 = "19ygmswikbwa633bxf24cvk7qdxjz2nq3cv9zdgqvrs7sgg7gb6c";
};
buildInputs =
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 1500597318f3..6c6e05133bdc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
{
- version = "62.0.2";
+ version = "62.0.3";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ach/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "30660e1377c125ec195006d84ba5ae356c8b53b21865675ac7649ffadd169e578ab91d0107f18f26530788ae66aacb7edeec1c507bccb456e1aa89bac95351dd";
+ sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/af/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "81e3d9b33af731c9a79bdac678c84d2f30de0b77b6d90d4adaa7da11383e360444f85bf7465add562048d13692cce88b3fb1bd63beac30a6d490f6b75eb9be26";
+ sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/an/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "42d3118c2bba77aed919a1675538f52230841ec6c8398e2b9964631100c22c70335fc80f8757a916aef7c0ebabccc5356ca323901061d1bd0e5ad4eb0a10b483";
+ sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ar/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "c6a5a647e17b8b4fb4e20a32c2e492c6102cb899acf5af2d3af3af3cd122d989bfa452638d038b9b7c8c0bbade604f6caa11f42cbde5a3260fb13e44080cd720";
+ sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/as/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "c1664a83e3dbd7b3041449ab4f7b9b41b038425c126572d380bf9c5d1d7318264a8ba798d670156ba91625de0865ed0b6e4e38bbd2ea700a118b64bbeea95b25";
+ sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ast/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "31c15cde2d9a0f93fa742c41032e8b6e06ad24a5e6126c953e70c0addc5d1a74c5b5d06088002b4c1516a1f75b2e3e82d9d04c0a624db781bde2d3e8182062f3";
+ sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/az/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "8d3f949c325bd5efb9619e96f8d8688324d113ac7add21b1d3290c160bba1e2193f923a54d3ce295e75b2ea0a59ab9c718e117374a46963ef69c53f3ceaa1957";
+ sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/be/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "7cb5fd02ba28c54acb1c73320f794165c0debf35a35c5e15602ccb7677b879ef41c910deb4668c0f160663b7a6afa43f30492fc23691406848e6adde7fcd0b02";
+ sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bg/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "c6484b8b19941e135d2dd983085325d9f5bef118105879b0f830762ec1899096146a454397510286a902d175f9ad4eb3e849fdce38844535bc8a92bcaa478862";
+ sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-BD/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "4526b294ea939f88c92a3275ea17fe16932b410b0114af03d9f3db892cf6ed1a9d0ae0a6e0a651a0599aaee9bf53c69273b8d0286b94656635b3357ee2ab021a";
+ sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "3a17f78a48c7657d7ed834f4c05b523d661c5a692e27751e48ed8ea6f580cee21295b025a2474bca10fdc803ade0acef0ff0f0ce40de992a1fd072ca70a1062e";
+ sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/br/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "7932c59f390580c3a9f333fe40ddb9aace2c7d35703ec022468c503b4e58604fff777fb86e44cfcb84186845e8da26f55a7d0584d09982e88ee08e2b205f289e";
+ sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bs/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "509b1d013a5ef5bf5f5a8167685a7232ee400202c1bfda37eab1ad8965cf0d7a6ae2988163be050b5d37741bb405df5b28aa937c82e086708cd6d943b5215ede";
+ sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ca/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "75b918bb00c9039228b8881ac8fef4dbd36521b80651dc2d6b1ad1f6701ca39f3527b244c88d9e97ba1ac0a6e12ea7b6a3c40f9b95c0c2167e7c175b5d9ce37e";
+ sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cak/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "8803b41c4651174e4999804071b27d7cbf47497a8a5b83488654d0586fd6245d5d517c03e64e8e75ccc0991b2be47cb0ee95143d08828027e627409fe6c55cd6";
+ sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cs/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "182cd25579ad04713852e0343e0d9604f42772a4c6ad06da512a8286314451f7b90c667c2f199afd1a1162c8ff6d1320abfc87207602182a3cb32196916189d1";
+ sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cy/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "c65fff984a351cc67dba5574e7d2b3291de4e6c78f7659a6020d70f09cdb3bc951696ba88b778df4057633e9e06013799af58f5f2d0a052bdc22e7c98aaec278";
+ sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/da/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "e9fa596fb6c825fd3c2b1d5f42ad1c192db42ee046ad2f348733a979135d41bf2b0efbcd8ac2fb68e0337890ac3131a3454425425ef727225786ab0cb51f4d9a";
+ sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/de/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "7a4c786b18299378c4d8b797e99385e35ad501912f05c02bad311665be6d52a6435a3fa04c7a8ae8a562af654aa3cf17eb497fc9691fbd0b2cf46a67f5967353";
+ sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/dsb/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "52ae2b79d9106fb304b4b3b945ac9960614efdc7780406e87bbe1dc15effc049e8cbb91c8f4f2dcd1966ed0085e3574e3e1a4234d933fa587e05901875234344";
+ sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/el/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "956d5d36ec255ec122c09edda12a2242bbbb03793385fa9c417fbb8037fb19506298a31bed94eb39e825e4fcb66184901b3580ced8812cbc44f8a4d8ba339d19";
+ sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-CA/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "6a93cedce6724a19ea663e70ef9d57d27c144c1250c438ff15cd8d36c3d92b8a95c9e3f81fb53862b550d0765a8f0b7bdc14d6d9929a41f18357e0d0cfae732e";
+ sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-GB/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "c3f825196d8f1d1284644ebf07f08a7626086c869408603d50ded5b0eeaa98bb9f874c7df38bbbf3083dbb4a1ae8afa8e4c90ed35a83fd99bec78cf3813dd92e";
+ sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-US/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "f19a938af6bfe6499bb4e4337ece1cc0918fe56b361ced0f131f010652b2849d98e48a7cd06277580cc87843454c7bdfe816b65c99189e1ba749aaa64059a6ef";
+ sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-ZA/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "0214fbf75843617b0623eea8c8ea2ef46d23d739f63a74ff47fc87ff16817d9110862696f92ba614167386bc51c5e94a9627d0dcdd22c19c20bac4a24543c126";
+ sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eo/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "7da531166d26dfa3cd1edc327eecd583e10c8a2c41d007daba41e6f28e42159e1c43be5759061891c74ab0157ca3d4ce58b8a6a7d879ad4ce4c50586341b460e";
+ sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-AR/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "e5bc4003ec881a41a28b6847dc9d90c81dec5ba9d103111922fdcc718713c67027f5b04a9d608d4e8b20a656abd94e0c5c8d5819135e8884d84eeb952b855590";
+ sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-CL/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "c5360481d7a86bddb87805672dedab22735e484e3a048e5e57e9265034ac40d0e5586bedab617da1cb54a4b7c1d3b4e18bd5f0cc0c8b8d3563df54b7ad506b23";
+ sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-ES/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "8977a46f5946da99c4e3f30e3451110adf7993ad5a64f5dee09016932ee55a63ebca9126f7c3196191e658aa39465701db347068bdc6e6acc85d061873ccf226";
+ sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-MX/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "2bb3eeb2bef0f7c72c9bd95093e4c80b69e6f56ec41d0d4b3c54d2f8d7496884394583fb77e9f5e985ff6dedeb94711d4732baaaf5947e26e1f7b13f3024470b";
+ sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/et/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "cad31e57d54d5e533f5c999b2009d29c22c9469b7b620499df7f433d0e86f14ba336665a9d9917a48f55d9a57e30be70dd461e8e2159092d5c2c1435e842603f";
+ sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eu/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "6cfd46bc362a9dca327651ad9219979e321c8ec8ebef21fed64617e7c5540804ce0a16514848faff8e3a3018a454e8b90fac627054b92cb96f5fe8046326db50";
+ sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fa/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "cfcd0562561478bf2d14ea6b2d87c081d86c5c6d30bd7c2c1eea673e2a82f875a2f954955fdac959ba96ce5fe8461c82137bd3c6313eefb3fb24bd4993692c29";
+ sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ff/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "ffda297f92bfa0a76d613e7c54a71d376c2264570ee8d9f2bbed9faacded01cc8ea9fb171ae14f4d349702d91896899299bfd6b2cb66e9ded933bc6e34e63033";
+ sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fi/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "be791b05d114f2d49c23714898f240aeaf9593aae6b7d06a85fb3e6dbe9116ee19d5089aff137e1c0fc56873c172a73937e15b19eb76db15122019649dd83a58";
+ sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "1f167a7df26ee83671a7c3dea3bcccaa7797da0253110eafa3de5a17b7e19d1710966ac3a82bb0e7bee3d7287a6b39f59b9152672618dbad5d782e297ea6587e";
+ sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fy-NL/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "ed9ee111ba5b451b5fa730bc0f8e14046ad7613d542a7695f68e28d9fddb279770e3663d8b9964617d803f073c7f02dc036e4cc6ce3a17b69ba5fba782831da0";
+ sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ga-IE/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "073b104cebd63452fecff3949195ebeb794dde2d4c2defb44f62f4493165f5dcac20320da8229bd7c3e5410b840bb51b4699d77fdc886974848745e066ccec16";
+ sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gd/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "307262bb8874fc6115051608bf4a79e51fb08910de7d3df44a6bb3bbde64d3a76aa88361f10b811a2af9a05518d7ba42b6f2e078d5db32f0118cd08f8a3ec7fb";
+ sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "dbecb09308a701aaf13d278b208fb3b9e7631c8fc07b9b3fc99c27a4035ea7fd75da810063913449c2746933c63cf7a5175d4d5a17aa808f6bd8d19bf0692f0e";
+ sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gn/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "f62e0a0cb6794f6fc36c85f98952ccd313676d4389b12a054461789e30effd3effb6fc729bbdfd83674c2691d03aa219ddccfcb6eb74426ff49bd4a458ff7ca9";
+ sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gu-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "b0624b04a3a20a48358027aeac449c52198139a3e9dbf0bc035a06c22fae3bcb44f34a07ad88a14a44e87dc16a3393688ce8d45d5070264d1ce63b2c183aceb1";
+ sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/he/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "7b3f4478100b6122c22fc50a944dc86e46b3d2d73893209be748c001461968a21500562b2eb18a40669d13068618ca3093ada082470833085b78f4083064767f";
+ sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hi-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "13d42b552bca18e0020b891f6b3a563b66dd86b3e5fb9b5badae88ecf5a37b5febd5b9c927807f7996b81ddfcd4ef076553fc82655eb05c8a04a920f2a64ca71";
+ sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "5bf92b1abd156019935c8728435101fcee9973ea413cca05760322dce94b62fed9f7271699610e00e812f0c7d320cbc966bf03fd5250b9dbf9bb2ac2a5f96466";
+ sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hsb/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "777ef75daae66a138f4013ff19fccaf7236700a8c2a46e6f0f811065326c7f4fb7dcb284ee9bac2dc3461b45cb8239015ff24731a691a85a199519398c03e53b";
+ sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hu/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "800f1cecd46b4adfaf1ed20878d422191709801e148aef5e827c4cc3b9fbd46ecb475dd3c4b412a39ae2b05d4af2be8ec7d75515e2b98b1e07aef74fe49c4d70";
+ sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hy-AM/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "910fe027a761480a4673207733fb5a78c0106249806f5c5347bb602de6853ba4299f2b13c896a088368eef036bef38962a487b4b3d6957f765f39eb06bedfebb";
+ sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ia/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "4138b14e0cdb6f6760e5892bbdfea3c244460cf2c922e737a1af568b1df5aa0076cdebc836688cfd74d97ac859cb8fd71ba52752f5db1b28e8827ca59123756f";
+ sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/id/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "463f2d340b7c439ee64ee6429021062cf05b2fd4f32226723bff37a67c5f25566ba5d6815a5e604d82df97b426b677b3158b2f8a565762a340cfa7425ea097ff";
+ sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/is/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "ec264aad9cfe095119f7f52f3391d376dc1864c24eb133bd51bde3349afc92c3cd1bcd0673b1fe95fa03ad36f869e0a6ee9835e97e922bd949228954779c075c";
+ sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/it/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "c81ee4ff685fae9108b07235931b9d0347ca46e3063211764fd1762e2ef9b5e4e337001304a14309c97593543859800d7dab9fbeb21a18af1b84a2b2b6c6d5cf";
+ sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ja/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "2f0ac4bbf507d3c306dc30dbfb94cb3bf8d907431f9a5c6b863505012cc4b077e22144af3658dca60e056d287273129f4742c72cf78f800162347e64d2b887f7";
+ sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ka/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "4a85a9f34e69abb29d63ef8cae372f225d246a5065a26d03d99a22d137085609e6ef5adc03df70fd7fe1057731472808f510fde2a40926418fb98cdf8dd452ad";
+ sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kab/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "7b03433b9c79203feb40705469c6788b8df08505ec2e92c704570e0cc5b8066d2b305a68a4c7a61f81e07cb6ea7ea12c059b00e8c11870bc44be54406e8a224b";
+ sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "51c141c62e3251101a5b110573c26547533fb2a8bb2019cee63734ffe4ef2c4d1b4b6e5e540d88e0237721ec7d0d88c26bf5c179630f685c037e3f9eaa0a6f02";
+ sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/km/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "113303e05d1ea54c38ddcb0476873214696f38b17aeae64381a7bc00bd59d3ec551540125190c0a48e9e85abc4de9ab232bda0a6dacd1bf7584b7d09c9be67ad";
+ sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kn/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "3dc579341533e0d9b82919aea3dddae1ad247f9a994d52d26699bd371c8910ae5b417e76be04002af53eb3caf5a6c2323261e48dccb8b4ffa63b27fe80272681";
+ sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ko/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "4269f0f945c360e8385dd83d3a62450825a9e74c349dd74a9f8f18e683a83526113ed315e5e363dfe00706b59bad92739e6b08c004e27608addcbf599b7da21e";
+ sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lij/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "ee26793ff03184b9221f7cfc88bb351f27ce01a04fbf74681f355e2a0c6b4330eded098a4ecabc3215e3c6b78fd2d09090275a4793c845b3c6debab962e2999c";
+ sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lt/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "2f7b98d182b4aea92f8e370107d56f647e16a11a1966c2e2e47b8b4ce2b45d9b9742d09c19478c200cd7fe42889ec4c2498304626fefa7531e987ad134e3c05b";
+ sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lv/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "7c31be85ff6b3295636f50b9c7491fa467b2cba1e5ffe9c7ef997c3674d8cd801e14ab8fc9bc2d1ab75d2a379aa590109530c1ac81599f26b747a43cb557cfa9";
+ sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mai/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "e365c3e4a9d2ccb80871c1530ae1e372d4ac1a809cb2c72f82c682161dab6d7707591194a72481a312760a7819fba0e5dc9ae3f80308b7a9c45af66d97e47230";
+ sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "e28b9564ce368a8e68c27436e967cd5ad5adbff1b78b50bad64f7646cee32a28f2dfbeaf0bd049d7057ffef59ce709765cedc85ea139b84cb6b02d95c743cb81";
+ sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ml/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "50ce7dc0445a37d125fddfb51951d455b91bec19f807df262bcba0734a7cf855d455e965144e1d8da4692c4013861f62cb683e364e33e85f4962c99097b74838";
+ sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "defcaaf5c589d0a11104f06890f986ea3cb627db499c2bcd1fc39162402b09f8c1be3fd05ca33571dadae9e8d127d1d67dc5f08804f670e8f8db45b33ead6234";
+ sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ms/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "2f36fd10942b2a700b6901efafe2fc14e8a7cd97d41241a070f87edf4d1ebed63bcb1d202b1c557426bdd8fd96639ac263ffcf0c96ecad9196916cc69c9e3e90";
+ sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/my/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "71001dd61027cd3acbb12f555a19ac3534c547b2d9b2c964a6bdb656524429ccb25b6c601422ec7f8af9e7d6319319e4bdf0db15df3f3833611d72d3d9eba410";
+ sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nb-NO/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "2bbb7a4cd756757c0559294a487c972ab0c6bc6df005c948a24978a35f51c369b66269dcf6fa96795525758ae66e24670fe8ef7fa0f5b05b7d81bff79f2cb762";
+ sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ne-NP/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "4bd51046dd55004e6a08dd0fc646344f91d7d830249fa8a33284f4c66bd5f11b1913920119593e45d9488db1b9d7aad1a74b296226633d94a02c0c705f527a60";
+ sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "408bf232f3c1e592a929ff2364b52af899aba1a7542e6199366a7bb0369ec14bf3c44964851a6dfb37ece8e9ffb342ce7448c11013c3013bb0d4e1d67a43e2ca";
+ sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nn-NO/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "450239e4d62d03151b0ff093e04e4cd5cffafeaa91da7374390d31c5944366bdfd0361e6e59b162352418436f7bdb1ebdfbe959107efd14f0015de0e873cd5e1";
+ sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/oc/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "a7c00d91430494659a4a2285ae9505329e18a10985757a50f9543d46b6ddcb740cbc440e31a1718ba4b830661bed56a0054c5309b04bbd8029abc691b59f0c08";
+ sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/or/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "e0ed4fc73fcffd0c59f87b6ed8d1ba4ebf8526acc79ab5a2fdbd689c1329d185bf9717cd34f0921d9ae2028a18bb12d485a0cfdd20dffb3e2a9b33969df943b6";
+ sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pa-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "8106baacbc84b053eed0527ef78f9ba4bdc94f0679c0d887d72bf19ef5c6a7950b6d8e9a35d493b51de031ef2e4720d03abb9677355a65b2a539c9e73a4ab633";
+ sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "9295362613e98387d10160af9f779a03c8318797e98daf39a514d70618eeffa53066113198257c6cbf1373fbcde33cef525c917c85fc3e838df5f918868e10b0";
+ sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-BR/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "d5bb188822c7b8e5ecba035585621685cd1b334950b8480d73b1841f871325236f9a13a3a4f0098d11588c0085c20fac7525a57cf83687a29d15f05cf9d9cbd2";
+ sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-PT/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "ee2f8aa32c2e20bb69ee291f3bd4ea931d5b2ab863f6f650bce92d35b331234491b93296803f5ede49ce49027b805241db44989bf48ee6d68722d262625b1fe1";
+ sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/rm/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "60605882860f1e1b805f8cb74539c421e45438aff07e79d6b3b1db3546d38950059665ca443d84617ddc9a4a3c104940d885f294932390170b3bc6c2eedd0529";
+ sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ro/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "850063575dd69270903a031748e665cb8363105057f1e170e43f264b3a9b228976fc901f7e3749cee22e3d9489b3357240198dc3f22e20de5b9581729e8c601c";
+ sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ru/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "8491c625171c0bf7c88c3f3a053e5f49a7c56b9dfc7c0ea7c381bfcb7505ffdce6a1079d15c73ce6a4edc5f89125e849e8b5fe8d464a4440d4413dcf6666a0e8";
+ sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/si/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "bde4eaf6879cb40967ebc872738f5ac6b931f6a1a633886e35985fda76de4ea4c0a4ebc7e68585dab34f7f453cd54977bc84fbcca636d53d6c5eddfad6d13bde";
+ sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "776ea025a2e087a7d8717c3b63e8a203f13ae7e44812e0bcbef8075aad1166f80cb6977970d88f68720772668cca982662c2172f1bfca02732a79daf45974112";
+ sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "1bc1a53815d287acef056c981bf306b1ae7cc36d4c8acd3bf556f3a2f44e6af2c05bede49f04bf7fd591cc5f0be40dba10b38c5b64379c673705b57ac0853d79";
+ sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/son/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "ba3f5377ad15c8586c7e826ffe8c614ba71f49c9867caeb1fbddf9ffa86d513f299fcf39d750c7e91db88ba17533097d38def63c8614aca743946d2a3b0b0484";
+ sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sq/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "c3f35991e3ff9410c4829491acc4a7f7cdd61f9104778c168adf3e1d359d5d0c8cb57ef552aeed669f80098c546a72f7adaa09cac4f486dacf78bd381f5fad76";
+ sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "df6bdface285322457f676d74703084cb677c6c429992a87dfb933bb3da25eff374dd2894f13c37616268266e3934a55cd61f3f6239a487595282ada58bf69ea";
+ sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sv-SE/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "a48a11e4b1e1bea955ddd73c77e7f5e1a7d03435b29659f7b610a089b604cdfed57893420d0c1827198efea6365a52ed236a8296646a980fabb6007b865a78e6";
+ sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ta/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "e01845b225c5516ecfc25afde98e9691b9afedf27405207cb91e655a9b48edb416786a2cb99ad73df37da41cb22c58958165836e5e6b1018c6c9f788f2b9337f";
+ sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/te/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "95b795fd6f995527d85fa83b122bfd9a2c091c792c879f7f4611dde63b4ddaf0502d3ae0ee33002363da359d1931d008c01e40611eea61f1ff66aafac2844f52";
+ sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/th/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "9ad3d99c9479155e20559ee1c8ef276a69b591be2cb96700075ca19352f033d9063d9f9b57ea9fbcab5db9bf46e1cb03c9b001e6254b6b0bee5547f8c91fb59c";
+ sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/tr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "90fca950893500868edc6ae1c0aee417cbbee7b7a0f48e0f10421b3d7ba495a56e090543ffd097949c9bebe69784cb8fb03b559156863f9dee940aa867421135";
+ sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "18942b931cf09b03973a10e390ac15c6e5bfd1f730953b782b7929943838be19bf4a61f157b33979f1a8e13042f1f4facb08ab205b7825d285b9e96c0ac897b4";
+ sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ur/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "7f16c4810467469385a88346f5ee3fac4d3d95342c6a6d37e0df7880f0b08896d0e39e77091eb0262a66ed7fa15c3151f244eb47ce4ea774ad21797b5da502ac";
+ sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uz/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "8266d638c74a78fa26c939c1ba7a6abd05ede85a9e349135f1934a6e3df27e3f6172026486738cea28e50689b84c29c0dbc63cc8779faa11a6ae55b4f367c23d";
+ sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/vi/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "787e570afae27cb668d6f4b9b6e8b3097f02148c2e2974efd1c58e406354724def031f04fc69c0ed10a04ce5833cbf7bb2ae8fd77ef068f8f17bf2118d1305c5";
+ sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/xh/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "805df0dcc24a7d77afca47335b31cbdfd0d0df51145c9cedfdaba4d865aae71697eee14e446351e6fd8db950e3264ed788f66d683356d4fbbab17ea9d7c2c452";
+ sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-CN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "cb251f942c31cc0c30c46bab04f658567b16f379068e7bc946970ed512e2de08c6e3511990b722541756e95261dcdf96b03cb247072f0b230f66ba7afdb038f1";
+ sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-TW/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "afa5847337657cee3ec28896a089bfc0fc2b25750d6dc271bb83740ea5170e2f926fdf3158b0b136eabe0d2d6b4b81db1ecfabcd8c2049164af54cd796e9a7c2";
+ sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ach/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "99781074276e530b9ceaf2cdb8f902673ceeba3df515a6c2c2ece3fb3dfa84e6f3d494a3a69346a3f9fef20d11f7bac0361eb80968ec7b9e76b603f8b001749b";
+ sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/af/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "bd9c6fe306a8802b22860cad8cb452b6591c0227e12ffc4a33db1a88b811d06725348e5f128d624240b9666393cef35b30f5bc7d12e41a046bb318dd346f63f2";
+ sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/an/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "289c00b7bf464fb6d86cdbf24274514dca98dc47e78389125287792e8f77708090c120aeb5ebaf4688e16857c5fc6b78fc1eb6f0a7efd7afb62c22fee325e78d";
+ sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ar/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "412cdcb82e2d60e2f37658001638bbe50cdd3a7db1e9bb4cb0e2fab49b878fe64b62ef019e499c3a960bca3510266a0afb3fb4c57cc5a8b6bff22aca772e643f";
+ sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/as/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "8068c78be22e42f9174cd6f9e1e7dedff527a00865f722c6dd9062c6f5cce2b83693d0938ae5f56197f72f5af71bbb485b0970b632ca5dfec9190214558fea2a";
+ sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ast/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "37ab6ad2899b3b115bd2b59f6be121e2d340c27eb745f698fd2942ab6424c0840273ddb4afeaf1083d9f458408b939270d971676e9b08e1f0fa409bca69f3e84";
+ sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/az/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "5724ae7680d7e88061a4cc45706590d519a5bd769b204d06ee0e8e6e86f706b312b665354d22314853af0a73b073acf68be8b7c3ae9dadb87984e1222722b4a8";
+ sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/be/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "6249b41382a1d2cdac2d9c9d235697a70bac76d0dfb341d3db41c0f329cce868ef66df6d2f249b4e22a1daf737d5ea3b7f2cad36a2d30b1dcd649fc1476218a5";
+ sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bg/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "a769ead4a10d4168d64ac9c2391c0cfcc5e0dc33f4521d6df73c5b53087e3aa073096af09adc49c901489e60af9839ac888483d63f7e9bcb1de2588236cba75a";
+ sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-BD/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "0761e32fd88fdea9c87686411ed87affa8875f2047ff9b1b1ec11376583001c9c9b421b2b27cedfe883cc5cd233d4d3a932aba74e50cbd74aea63a6aaeb64c8a";
+ sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "1868b2d7d6f32936c6072998afd1ebfc232158940e5270bf483c6c29a8a30682f0ba729161e9b0aeef7d839c9e9209739380a20b8b118c49112bd71caba03ec9";
+ sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/br/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "43d1691d6b1d9aafaee55be50bf8c4934b75c0501c811314d12e1156c2b68cd58914362e167ed50fdf5267a0d7a2db9730c68bf318d492bacb8c33eee7bdd12e";
+ sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bs/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "aeac8dc018ed59e2aeb68b63c1a1d6281e543975844e3ce5b7f22991968bf0e05f40cdf1ad3bf434cf9de774363b0ffa6f96d1c0b457f0372d4d1d943c0a40bd";
+ sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ca/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "10b6c40701b7cb8f2543e97a61335f426b210273d46d542034bcefd7d23c95124cada1d1df85c3b5e33d25e8680678b18815ed0c8ed58936061f670b0abf1d87";
+ sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cak/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "029cfee850c3ba5ac408b6db45d66dd9849db392097dcedc64d637756ffba893770a93915eaded6302f6e667f072949fe6decfdd918be292abb9ab8d1300c2fb";
+ sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cs/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "ce919ca42a629f171df4faacabc18fc3db0faf2d38f04912720ba697612215e0c26f650781a535b5e956dca912fd47d1d9b9528910b8e9b7a18841c411e25623";
+ sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cy/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "727827fa6b47cdec5048f40005872f021cc506d7c72a7f1a6bef9f736612341fe3cc6127b3bf005f63620f17b180a00c3fa0f799f63e685111119f9661d9ca7c";
+ sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/da/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "e795a7aaa38c28733a8864928229d91d752d6f0fe108bc5a3350b34e783155c3be14a5c0261eea26642097db2a583a34553d746d6040704f34de82953952f21a";
+ sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/de/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "56185cb92f9a246140b58119cbbb6a128905c8e244a7ed8917613a65fe8f87a542b103afe69f1fa542e47efca18c8666e669c266e9c107661b800c5e3b4ebb75";
+ sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/dsb/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "ff30865cf3135f466d67143487ad34a50b73c11000419b2caec1c232d4efc805cee5cbd282bd1e0b9ccaf03ccc95e08ac4d1baed93abde27b45b0f2af5d71fbe";
+ sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/el/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "e22d89c822843db26e05834c088e5d687c6d315a870ef2457f13126bd740135016ebacf83b9fae131128b4fcf62b474a68fcb1fa12098aec22f199a5871e63b6";
+ sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-CA/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "0f462a6900bf92513c40f28a9fd2ecb0fb3a69678b2b0091e6495b89b9a2fbe6c805e48b2e55fe274996ff7a15c32294d02a3e025b97505f920069cd71b23341";
+ sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-GB/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "dd7a7fc0b05877f1e1f297b123075695c97247e2641311ff646b953e002278e2e16187682226eb46034cf3959880b2d17d74314ff7dcc654b1963beca6785410";
+ sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-US/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "bdb45cca1c207502ae5f76fe10e4b73d3f7e6079913bc9a6216e9325b8c70fac37d14e32b4e5ef6acadd73c301c3ca1aa2d72a5d44acc0b6cb0c22b481de2e46";
+ sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-ZA/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "351ab5114b25daf11ff2ce1aa377e6c16a7adf9807a7609c97e04f30911f8680da727c6dd1d3067e028978d3f6f793351d99f500374372dc22b11ca760e4d36a";
+ sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eo/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "1ec40261c42db667f1680361e4e7f12db271f5fbe6d213d44d0722e692a93421bb92d73193f87f42e43df40700cfddc7913454d6a64f5e15fb78f08d7a5a3c0f";
+ sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-AR/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "00cc8c232fb4b7b2c56aeed098719d60deb26abacb38f8a7ffd9117c8d8875c838fc702413a6d8584f862b35843262e2bd31074bfbbc7cefa6f62247d8a16abe";
+ sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-CL/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "70da97fd43b84b5475e707780c215f73b05a423577f6ccb67a31e01370842319d40c6d691c99da138db881d6c5de8f73c1bea8287fb9ba1cd3647bc74ff8125b";
+ sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-ES/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "76b717e852c1aa2f3801a5460a8f0d51256486d5bb688b30cb85abaa30eb8a441cb28391988ef8ac4fdd1a430e0c09a2c298c8738f7a76e6a18742bc2a4f3998";
+ sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-MX/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "e4e7f734ba533a0daf56d9c99881c0c1c758ba6e492e8e62b67944fc3a6c42c82df7e4d01a27fe797077708d49c810a51bb05d3fa4f2cf91fb63548f82e25322";
+ sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/et/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "6b832c2b71b0e42db5a2292d90f1545ab545845f30b09baf277bd48597975e426cb98442fc16b7053d5c573d50d42e37e89cc49d7f325835aa5582262333fc4e";
+ sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eu/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "5bc67a8afec07f48c99ad331257236cb2fdde7fa23afadeb3de8c270d78e93bf855702bf82781c9c90eb5a4a0b9966d83bcc6d8f357ff5ef2bc265378200d674";
+ sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fa/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "43d16efdabc3eb39e3aa924387040f6e92c80333087369b754065c34403d202f0881c993bf667322f8ddf303a8e066c4203b2a4daebaf68ce5b95a8c1cf80844";
+ sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ff/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "86837496c81d9f1209719d46aa396d17eca17a13f111ad0ac3b94f1d3f9bc60ddf8d8b10018e41100e091996d820975db897abb470fc85e0d87a0ff742a67b34";
+ sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fi/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "baae77ef1bfc59c87eb72c3ad6f8524dbdf5fda9502abccf297c3b3f6e1033002d9b4e5b341c9fe101bbdbc93dbac768bd962ac9378088c9c567ec5d71ff00d4";
+ sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "60fc885a6b5703a88dbbb60bed41296e2a1bf73405eba33a82e5f916ac0b22972377aec321c2b13d7007dbd94fdfcd24d43fc8f0acee37fcc9e23543c5a65f67";
+ sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fy-NL/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "945c2b7241e0faa83e1dfa1f36a3dc86cefb03d3c48191f2ae6b3dfe8384ae848440731d69363197f724da3c32988e20c0bbfa3adbc52e7eb99018b7ef8c4510";
+ sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ga-IE/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "6b3ffd73216ce3879b26211a3dd26db393eba8f0ec3f35b6626bea3847a614d6624f1fd6fcedd5ac00e5bb08c9465b8ae63fd4105a79acf86bc357dd331d44c7";
+ sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gd/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "cdea3ed1ffd14d02d6489983832cf11f87b1f17bc73539e4b27f7a76f267b491ddd3163a80ef9a953e3c79fe184631a32be842474427d9792b2d525df8006ffd";
+ sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "b098ab10e0fda3fe67a04bf3040112e08ae1e94e30d65a076fa0e1f4d4e30e1be99e9578e06650f2fcddc6cc6b57309afbbda71008af67ad97caf9eacc7dd550";
+ sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gn/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "a83c0134556894a375ba91137d9513322a876299edd0347eead0869aebb4b04003dca12594cb276e3a521452d4b6ebbabc6be8f79040514f26f6827f55c15d3c";
+ sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gu-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "d313657b11f3fecbb0ef26a0c5a2d4b9ead411f2a3c55bbb4bca3ea3a6d861ee54ed1950e9bd5b14b24b9fa569c7c67b73807353331af60e3cd942b570430a76";
+ sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/he/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "a05a94f0634f1a857eab463825c97ebf2fa1b5315c44082095d6fb674884b77375968ebd39df05fe6f0f3892b87d9f1313532ea022012cb411eb32a43e1d01f7";
+ sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hi-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "e4cc460637c6aefab1b323ac5a13674f9f95eaf5cf0bfc2020869a196fd13f1708814b33c938981017fc27cdaaf57e75591ce2917cc66e5f97b3c8f22d3d44ab";
+ sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "74c11421c3815b5772cd9a5f74e1c48d914d335babcffbca984187b72dc7a5db0609e7b31915f58d358a12c52a0db204ff191c78af28609c1e68d002a32f313a";
+ sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hsb/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "8b399983719f73f65d2db17af40065faaab4793ab32ab1596e79b6f844d43fe4bf3386343b50a244480bb9f724defc795a6479703cfdce305dba0321e4b5fc09";
+ sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hu/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "a5443cc52bcc5881a7297f2f200418e2a9791835f705d472bb657caceb0bb59f8dc1a7c424b196c2a66bf1f0c042d092a55c5b0d04a085dea702e11e433ed98e";
+ sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hy-AM/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "ea3e471c41d3e17c99c5b819ab8c3de8759a275d1ee1af66f133f835ebb6be9c7aeb52ae8b6f79d849e489e0c8f79f69d557d101efe681b27ff38b4e8b306b54";
+ sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ia/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "8bd09d0a8bfefc1a73b3a256a2e5be976b88998055299485c6270afc7ee7805a90e6ea9de144bd5ee8d3e40c079adac1dc29e9beb6d7ca376514fbac902f8de2";
+ sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/id/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "c19859ab8b24aa239b0fc91930d8fb581850e631a9aa9033a98aea0287055d2a02ca6ae154ea23e37fd407a00999af1b5f7ce0854865b4b19a8462ccc3838cf5";
+ sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/is/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "68fc21b8b3aefe39bc6e87e8d90fb2652f2125af45520e7f91eef12615aff81d0c6237f3fbacce99259761f0f45c7b49aecb59894f161faa8760184271b2fbbb";
+ sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/it/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "8c8866bff0ea8c2e70a82798253334feca4d96d2e79d37d479f8bf2b5580912565ce08bc47777ff9340ceb4e5677d01eda6cb1d28f25274bab400086493e4610";
+ sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ja/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "56e1bd61de818e9271d483bdbeac7c8a95e00a1a2acee2ad7d7e5779b0bba452170d8e0fa6463b0f978ee3c3df720bf338367b8b1f041e5000054268cf267af6";
+ sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ka/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "de329fbe61b7563aaa2e62b1dad827445809df6f675518d7d19d9483acd6e23fc502f6abeabc13ed7c5eb2cc5b26a6ad0f0dd431c733f25a68a0ae7e2ee9923b";
+ sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kab/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "f739aa9432ce0bd8bea4917f590b076c0d88643aa595be951dfec27872d534fa3926a7ed8d82527e95a70689d365c1219d164cda79e06b7418b90652bd2b7cc7";
+ sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "131b3ab83b953130cda7c9c388bf096edf90c424f86d1b6f4221b3601829a2ae0b7cc073a9336d7e4af588e497fb5df7731cca80a8413edf40a2f605927ba410";
+ sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/km/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "6b0f4a83a746630b87b5a6c933f9aa65d6dbdb2e686af870562800aaa683371a23fbe79f31dcb0ef6ed397f556df83e1e30f83cb493921631e6ac1c8cbcd37f8";
+ sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kn/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "e4042bb8884ecf46396e9e45a70b57c22b0ef76dd6d452ee0609382e87669e6163c1d86845aa904e13894e750eb2f35d1c9a2b7987aa6e7d3fcd5eaad38d8199";
+ sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ko/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "02d30f4b2cc7285506239adfea681c780d0e16c1719c6cb68c908c54388e565bf98f1a3a3d98449b0e55b2cdda00627ad6c6f3e63fc9ad10f8c96b2df6138620";
+ sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lij/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "3cf57550bc091d756c5a2bb707aabf78cfab1660e1486c9276de5ad37cbae91be24f2170f5b20560ecf7f53d21217bd738b4e4277504d6f8934d3fe1ca5fcb1f";
+ sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lt/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "606f27cc78c5ee0ea3a61f6110611ecc10c35af63cb9e7c5fa1d3d0ca7a74ac8cd81fec30c1ffe5573c27e0a7f5f04ed82105b8cf26b7c22d648ea217cb57e83";
+ sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lv/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "ab028d6f31a966ffee99cbcd5263b18cae94c6e0a6e3e055d2c86354849b68120d870a142678184a32f816c7e5803d221f3230b895c6ec71dda20a6540101c50";
+ sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mai/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "faebf74c8a194f3dfe33addea35965b11f3f9e0c2b4bac4f9e4056c2248df24c26bc9e5a5696fe3f8c2e30e2172dae03fddcffef09bf7837fb6dd9fb6a1b3075";
+ sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "dddef2e42aef03d11327ae2bc186c0dfd25e81b11845b319848e7c7253c101d32b2801548f6444f4ca01a91c365cb2bc6067e765490f3b876d149899a9edbf3e";
+ sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ml/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "0157abf3d8dbd54f50f6a17d796fba6c66e0270649b8dea1674a696a036d2a59f5841bda55d8b326d90266a198ec0dea3a65753b09fffa583b104c976ab75cd1";
+ sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "9c6aa7a0a943b8f62f6888effeb65c6c3f36aac3353ff54011eeba06ff2bb0b66ead6b75d1107ffc358184df927cb2dc7cd3bca183fc54879427baf74cb8e570";
+ sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ms/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "b7a723f79a18db5b3d886c39e76a65975c2f6229022c62cab7d7e38c840206d9004c81da1783f4bf0cc373438518f1367f4a34e3764ea9919568ed4c8725c94a";
+ sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/my/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "5538fa15d3ff02409bf9145d384e1c8e28a182239a682aa5beba671c09a0b813b56af6482476d57084af6a5895ad21af1f6ead71ecf23ea817780aedbd33661b";
+ sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nb-NO/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "8349c51a6b01301de6b0e0e37b665f44bd83abe9f771bc086c3f369534b6d4efc692441a46576b2335afda93cd8dbeff60ce17936e205e3c7212a2ef1b2844ce";
+ sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ne-NP/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "f16911685a7d233a8957780c5526be9e94c07f73b259dad09855b8c21bdba1756ca70ee71dd7b732ac56555135d749584986bf4501adb056373ded74f96e265d";
+ sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "07e271170d05cb87cee9361efe8fee2007ca032b462ce68c562406fde581f4baab96c2ccea66cf92b8e72aba4647e7bb8271ec50e3adcfff6b787699b687a23c";
+ sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nn-NO/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "eaace3b808dbc919d05a9701e7af2bdb241d57cb0356e4eb60b4706def37372a16b7767540947efaa91d5a3f338785187f83caf8bfa5bffe5f4f92aa3bec13d0";
+ sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/oc/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "aeaab0fc9ba77aae2c0ddd92d7096c167a99335b3d795f232a24e685d49b53678bed59b6e873ce1c7667f76d1527bf685b910bb51b8defc539999500eac14d5a";
+ sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/or/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "92b82c7bca322a9bfb6e6df61c9f2b6d82cf39c67848f2905dd372a627eb0379d235982e5634577825ad72794fd1d49b2e591ad5347977dac9a745d1167f7467";
+ sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pa-IN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "2aec320ba120dd3632fa95599a9934ce133544e7b0d15a74236fb20435ab0a9ad44d6515f82897e7badeeeae19eb80d6b68fec4d000d63772d4e5ccd1f11d1eb";
+ sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "b62565b94eaae3ee225f2bbc8981f493594f48d40e8e8d83564a6d4ac6a4194c952663f9db52d7694993f08f714463b7607d659790236a727cbf803b084eb73e";
+ sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-BR/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "2b218b66feb456a86919b395d1cdc40aa73de6ebbca3bc4135c54d5dc1ac993bfaf169bc7b0d2d770aa6f4565e71ead1fa2aaab02dc7362a9f4e5a896dae2c2d";
+ sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-PT/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "d89122b993083bee798279c72a2d6296a5b966f7ac30269edcfe17a2036db648cd3e1e77eaf5f2479afc3c6831657267b22f2507176d62ee08dfaf4c100e074c";
+ sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/rm/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "4ecba1d3bc6b3bbbc3ca974afa86e9b6e7664a0dd23605ea34349bbf822fc2098e7dd394f132b43e2e4127eeec36ec820710391671405b14c414d966540b63e3";
+ sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ro/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "97e8ebd7bc491bd320106765408bdd88542bd932c3c1b43a373aa5679f20e2a0aa12b48182454ec36812dbf4044364850cfe3e6878bec670ee46e8971e9293cc";
+ sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ru/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "f8f433e0d2970d028a01f1039951f1e725cae8e263bed9f0dff64387913ae269558f037d672a65d32614408cdd3267ddd65677dbcf212188c531d04960266535";
+ sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/si/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "11620e27c01dd91114d5e2080b430876282316ce6d527100305806314b4e7fccc38f2e93165f3e544cd3ef63b03aeaf738d6079201a0f7ae3f867b2e0b28239f";
+ sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "0a43e8fdc1c3f2bc63b6bacc15f9e3f3527302d0d7f0f0e0cc9498bab7728cca944fddf886c33ab67c60bcd9bafa051db97c8e8a77e781d6869a4bdb8096f4b1";
+ sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sl/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "343a22feab53142ff585985fbaa8a037dbe9c3d3c2c073361f8d4af3b74272a47e5df2053ea91b333bf0da15334b9512c0513726ae80176838774020a7c7c639";
+ sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/son/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "bb9c9c4bc82550b6d83c3b9995a1ca3afadc9fb5b27a5de4503682d29428ed7751895d1225a3b5ba8472d539c9efca957522187e4119e4e134f46b37da2f43e6";
+ sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sq/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "97b2c394f71e9bda6fa679353c579a01f40a4fb5b588bc177329d6fbfcff0d126e2db072c868eafd6078c26f9190f1a2d4c65f887754af4d25eb9c128d807030";
+ sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "84024816cfd48076ef5ddbe0af392ab5ae0bcb8a02cc0ee1f6d0dafdf5673d9dfee377e83f0a9508c11593d8f4db682ad400c336a1c37591c25864c9299939f9";
+ sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sv-SE/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "b630b627b038b16ae1b97f669e79afccba95e66a93dc3b7358e26960ae836f1f3663a49394b7a9be9906871a2301824c6b1f78f1f38943b54e4631f9beb90407";
+ sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ta/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "1306d444c620f558894ea81512944e1d07dfe706306206d1638c2e86ae5a2dba4e02b5927e4c9250df3cbc607d15da15bf2cb1c9e1ff74332354ae883c6bcc42";
+ sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/te/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "3b0e1d6fea01ac99e315419365afdee54c107dd33ad577b19fcd9a59de1a176f34497e607fc7466217ddef5a6c442a62f1dd41cdb137651c0274274cb9357171";
+ sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/th/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "7bcb0d7e17d397a7b114172234f3306f9faa28e7d9f8bb2db1399b58c28bd36ce4e478686c3ec98c76793cc75bbb974a316599b3a7c38fb034e852100ffa13e3";
+ sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/tr/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "5c543b8bf79fdcb605b6d763688ca5bcd1e61b0e2088441e1d6d6dd4f0823f9f3d2075f39776d582bb468dc41ef39f7d562c7ebb6d5e4f084c3c1aaf1e61de8e";
+ sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uk/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "2fe636a02d0adc75d00f67620fcfaba902d16b5d828c2c9770560300c33cd0a8a8bd7208f146943cd62ac0aa8e3be784ff8549de78eb4f247783e1cfc823dd1c";
+ sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ur/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "c84e1bf737b3a4b93f77098a087bd7ae598364d6a15110d3032bab4ee8aab6d1a64ce3ec4ef17b197b920e334f1e57a7a093581b8ac3b1ecab85d9cbb2da2c50";
+ sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uz/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "cee9849825181c517a82c6f6cb07920767ff2c02d54b87c8e509e60bef3adff260f282882b9495b6034fa61b11e2cf831e3adc3ed3928ff32792a62084cf115b";
+ sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/vi/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "a0eddaf392addf41017108ded0d32418175ab5ff7cddf74e3224929da93bc84cf07312671f16aa5652ecdc315707a4301c69b856be709f4298861298541a065f";
+ sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xh/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "50741d2ff1b7f1d9cf503af66ec61a2d19600ad7240db837392440b2943c6d96a7b8d5538ca24f0d528cbe9fbaede7964c9f8404474f95a1c022e193fa91f81e";
+ sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-CN/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "103be3f37fa7a92c00d6465f93bedffc31527939bd85df0c742c04ac75f9ddec4018a368a2ff29730f5a055459b018c64afa344df255638ec3c26bb295e1a31a";
+ sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-TW/firefox-62.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "0ac22e595f2d87f75b586eabab07470f9eec16026a45902fb40c19fd2cbf93f2f88241900a13703edb89290953127c689bacbc0eccd560822e43bc07a97e3ddf";
+ sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 935be6230cd3..369b18d5ead5 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "62.0.2";
+ version = "62.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "0j5q1aa7jhq4pydaywp8ymibc319wv3gw2q15qp14i069qk3fpn33zb5z86lhb6z864f88ikx3zxv6phqs96qvzj25yqbh7nxmzwhvv";
+ sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
};
patches = nixpkgsPatches ++ [
@@ -70,10 +70,10 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
- version = "60.2.1esr";
+ version = "60.2.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "2mklws09haki91w3js2i5pv8g3z5ck4blnzxvdbk5qllqlv465hn7rvns78hbcbids55mqx50fsn0161la73v25zs04bf8xdhbkcpsm";
+ sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1";
};
patches = nixpkgsPatches ++ [
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index fe7b73a9e9bc..6b9a21c102f1 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -4,12 +4,12 @@
let
versionMap = {
"1.5" = {
- flinkVersion = "1.5.3";
- sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
+ flinkVersion = "1.5.4";
+ sha256 = "193cgiykzbsm6ygnr1h45504xp2qxjikq188wkgivdj9a4wa04il";
};
"1.6" = {
- flinkVersion = "1.6.0";
- sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
+ flinkVersion = "1.6.1";
+ sha256 = "1z4795va15qnnhk2qx3gzimzgfd9nqchfgn759fnqfmcxh6n9vw3";
};
};
in
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index bd00404b536b..72ab44e1934a 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if isLinux
- then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
- else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
+ then "18bk4zqdxdrdcl34qay5mpzzywy9srmpz3mm91l0za6nhqapb902"
+ else "03xb73769awc6dpvz86nqm9fbgp3yrw30kf5lphf76klk2ii66sm";
pname = "helm";
- version = "2.10.0";
+ version = "2.11.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 37431b0fbc44..c68fb48fa1a4 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,7 +14,9 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.28.1";
+ version = "0.29.0";
+
+ kubernetesVersion = "1.11.2";
goPackagePath = "k8s.io/minikube";
@@ -22,7 +24,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
+ sha256 = "09px8pxml7xrnfhyjvlhf1hw7zdj9sw47a0fv5wj5aard54lhs1l";
};
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
@@ -35,7 +37,7 @@ in buildGoPackage rec {
ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
- KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true
+ KUBERNETES_VERSION=${kubernetesVersion}
export buildFlagsArray="-ldflags=\
-X k8s.io/minikube/pkg/version.version=v${version} \
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
new file mode 100644
index 000000000000..c7b90d05ff2f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "stern-${version}";
+ version = "1.8.0";
+
+ goPackagePath = "github.com/wercker/stern";
+
+ src = fetchFromGitHub {
+ owner = "wercker";
+ repo = "stern";
+ rev = "${version}";
+ sha256 = "14ccgb41ca2gym7wab0q02ap8g94nhfaihs41qky4wnsfv6j1zc8";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with lib; {
+ description = "Multi pod and container log tailing for Kubernetes";
+ homepage = "https://github.com/wercker/stern";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mbode ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/stern/deps.nix b/pkgs/applications/networking/cluster/stern/deps.nix
new file mode 100644
index 000000000000..5c5d34727115
--- /dev/null
+++ b/pkgs/applications/networking/cluster/stern/deps.nix
@@ -0,0 +1,345 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "97efc2c9ffd9fe8ef47f7f3203dc60bbca547374";
+ sha256 = "1zf8imq0hgba13rbn260pqf2qd41cg3i4wzzq2i0li3lxnjglkv1";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/go-autorest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/go-autorest";
+ rev = "1ff28809256a84bb6966640ff3d0371af82ccba4";
+ sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "2d684516a8861da43017284349b7e303e809ac21";
+ sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
+ sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7";
+ sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+ sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306";
+ sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/gofuzz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/gofuzz";
+ rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+ sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+ };
+ }
+ {
+ goPackagePath = "github.com/googleapis/gnostic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/gnostic";
+ rev = "0c5108395e2debce0d731cf0287ddf7242066aba";
+ sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
+ };
+ }
+ {
+ goPackagePath = "github.com/gregjones/httpcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gregjones/httpcache";
+ rev = "787624de3eb7bd915c329cba748687a3b22666a6";
+ sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc";
+ sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "0ac74bba4a81211b28e32ef260c0f16ae41f1377";
+ sha256 = "07aa3jz9rmhn3cfv06z9549kfpsx4i85qbi3j7q60z2pvasjxqv5";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+ sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "05fbef0ca5da472bbf96c9322b84a53edc03c9fd";
+ sha256 = "1jc7xba9v3scsc8fg5nb9g6lrxxgiaaykx8q817arq9b737y90gm";
+ };
+ }
+ {
+ goPackagePath = "github.com/petar/GoLLRB";
+ fetch = {
+ type = "git";
+ url = "https://github.com/petar/GoLLRB";
+ rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+ sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterbourgon/diskv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/peterbourgon/diskv";
+ rev = "5f041e8faa004a95c88a202771f4cc3e991971e6";
+ sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+ sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "a114f312e075f65bf30d6d9a1430113f857e543b";
+ sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+ sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+ };
+ }
+ {
+ goPackagePath = "github.com/v2pro/plz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/v2pro/plz";
+ rev = "10fc95fad3224a032229e59f6e7023137d82b526";
+ sha256 = "0p04pjrz55zn6dbi6l0705prjmhqnmvsvrxzc74hl12wi6r35drp";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "49796115aa4b964c318aad4f3084fdb41e9aa067";
+ sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "1c05540f6879653db88113bc4a2b70aec4bd491f";
+ sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4";
+ sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "e4b3c5e9061176387e7cea65e4dc5853801f3fb7";
+ sha256 = "1ijx254fycsnr16m24k7lqvkmdkkrqxsl9mr1kz4mf61a8n0arf9";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "f51c12702a4d776e4c1fa9b0fabab841babae631";
+ sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
+ sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/inf.v0";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-inf/inf";
+ rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+ sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/api";
+ rev = "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6";
+ sha256 = "1dpmd59jlkxgrp5aaf8420344c6nq4kjlc1avgcp7690yrzc50v6";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/apimachinery";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/apimachinery";
+ rev = "594fc14b6f143d963ea2c8132e09e73fe244b6c9";
+ sha256 = "0xykhpmjgagyb0ac4y0ps4v1s9bd2b1sc0simh48c41a9fk3yvr7";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/client-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/client-go";
+ rev = "739dd8f9d4801eb23e2bc43423c0b4acaaded29a";
+ sha256 = "15psjmb14rz4kwysim9vfbbylx0khkw29b195rziv1vk202lh28k";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
index 0b5a091fbb43..b801fad546df 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
diffy (3.2.1)
highline (1.7.10)
polyglot (0.3.5)
- terraform_landscape (0.2.0)
+ terraform_landscape (0.2.1)
colorize (~> 0.7)
commander (~> 4.4)
diffy (~> 3.0)
@@ -22,4 +22,4 @@ DEPENDENCIES
terraform_landscape
BUNDLED WITH
- 1.14.6
+ 1.16.3
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
index 5c3946f3212e..aa3f5142aa5e 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@@ -1,7 +1,5 @@
{
colorize = {
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -11,8 +9,6 @@
};
commander = {
dependencies = ["highline"];
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf";
@@ -21,8 +17,6 @@
version = "4.4.6";
};
diffy = {
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
@@ -31,8 +25,6 @@
version = "3.2.1";
};
highline = {
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
@@ -41,8 +33,6 @@
version = "1.7.10";
};
polyglot = {
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -52,19 +42,15 @@
};
terraform_landscape = {
dependencies = ["colorize" "commander" "diffy" "treetop"];
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mlpbsmysyhhbjx40gbwxr4mx7d3qpblbf5ms2v607b8a3saapzj";
+ sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns";
type = "gem";
};
- version = "0.2.0";
+ version = "0.2.1";
};
treetop = {
dependencies = ["polyglot"];
- groups = ["default"];
- platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index fead9af601f7..261d067eb1d0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -609,6 +609,13 @@
version = "1.8.1";
sha256 = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
};
+ matchbox =
+ {
+ owner = "coreos";
+ repo = "terraform-provider-matchbox";
+ version = "0.2.2";
+ sha256 = "07lzslbl41i3h84bpsmxhvchm5kqk87yzin2yvpbq0m3m7r2f547";
+ };
nixos =
{
owner = "tweag";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index d0c4a6505981..16305b4b90c6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -9,5 +9,8 @@
# include all terraform-providers
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
+# include terraform-provider-matchbox
+coreos/terraform-provider-matchbox
+
# include terraform-provider-nixos
tweag/terraform-provider-nixos
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 767eb94454d8..a4ffe27102a6 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -4,6 +4,8 @@
, buildGoPackage
, fetchFromGitHub
, makeWrapper
+, runCommand
+, writeText
, terraform-providers
}:
@@ -118,4 +120,25 @@ in rec {
});
terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
+
+ # Tests that the plugins are being used. Terraform looks at the specific
+ # file pattern and if the plugin is not found it will try to download it
+ # from the Internet. With sandboxing enable this test will fail if that is
+ # the case.
+ terraform_plugins_test = let
+ mainTf = writeText "main.tf" ''
+ resource "random_id" "test" {}
+ '';
+ terraform = terraform_0_11.withPlugins (p: [ p.random ]);
+ test = runCommand "terraform-plugin-test" { buildInputs = [terraform]; }
+ ''
+ set -e
+ # make it fail outside of sandbox
+ export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
+ cp ${mainTf} main.tf
+ terraform init
+ touch $out
+ '';
+ in test;
+
}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 2ed7fbcee3b5..fbd326919f33 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,5 +1,7 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
-enableLibPurple ? false, pidgin ? null }:
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
+, enableLibPurple ? false, pidgin ? null
+, enablePam ? false, pam ? null
+}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,19 +15,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
buildInputs = [ gnutls glib libotr python ]
- ++ optional enableLibPurple pidgin;
+ ++ optional enableLibPurple pidgin
+ ++ optional enablePam pam;
configureFlags = [
- "--gcov=1"
"--otr=1"
"--ssl=gnutls"
"--pidfile=/var/lib/bitlbee/bitlbee.pid"
- ]
- ++ optional enableLibPurple "--purple=1";
+ ] ++ optional enableLibPurple "--purple=1"
+ ++ optional enablePam "--pam=1";
installTargets = [ "install" "install-dev" ];
doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
+ checkPhase = ''
+ # check flags set VERBOSE=y which breaks the build due overriding a command
+ make check
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index df627f57de5d..9b14ac6f2c3c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -7,8 +7,8 @@ let
version = "1.4.0";
sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
- archPatchesRevision = "388448";
- archPatchesHash = "06a1j7fxg55d3wgab9rnwv93dvwdwkx7mvsxaywwwiz7ng20rgs1";
+ archPatchesRevision = "388730";
+ archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7";
};
in {
stable = mkTelegram stableVersion;
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index e033e532ec1a..eb4d710857c1 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "inboxer-${version}";
- version = "1.1.4";
+ version = "1.1.5";
meta = with stdenv.lib; {
description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
- sha256 = "1jhx7mghslk8s2h50g8avnspf2v2r8yj0i8hkhw3qy2sa91m3ck1";
+ sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 5097215d4366..a97dfce27448 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
{
- version = "60.0";
+ version = "60.2.1";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd";
+ sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13";
+ sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c";
+ sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef";
+ sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336";
+ sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511";
+ sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889";
+ sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a";
+ sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9";
+ sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156";
+ sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54";
+ sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002";
+ sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427";
+ sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb";
+ sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499";
+ sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522";
+ sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1";
+ sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac";
+ sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b";
+ sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29";
+ sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882";
+ sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d";
+ sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034";
+ sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a";
+ sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9";
+ sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e";
+ sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b";
+ sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299";
+ sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc";
+ sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf";
+ sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5";
+ sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d";
+ sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73";
+ sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad";
+ sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb";
+ sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779";
+ sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713";
+ sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899";
+ sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4";
+ sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb";
+ sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec";
+ sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c";
+ sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4";
+ sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1";
+ sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1";
+ sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70";
+ sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3";
+ sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d";
+ sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8";
+ sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992";
+ sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68";
+ sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76";
+ sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842";
+ sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75";
+ sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c";
+ sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55";
+ sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44";
+ sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c";
+ sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e";
+ sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344";
+ sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762";
+ sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c";
+ sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff";
+ sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0";
+ sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66";
+ sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23";
+ sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7";
+ sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b";
+ sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982";
+ sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6";
+ sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70";
+ sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642";
+ sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f";
+ sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9";
+ sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff";
+ sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca";
+ sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672";
+ sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f";
+ sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9";
+ sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7";
+ sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb";
+ sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158";
+ sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf";
+ sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5";
+ sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc";
+ sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e";
+ sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5";
+ sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0";
+ sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2";
+ sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675";
+ sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23";
+ sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552";
+ sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67";
+ sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69";
+ sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3";
+ sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96";
+ sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5";
+ sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d";
+ sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16";
+ sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e";
+ sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951";
+ sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2";
+ sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264";
+ sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349";
+ sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45";
+ sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac";
+ sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76";
+ sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3";
+ sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36";
+ sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc";
+ sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13";
+ sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777";
+ sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a";
+ sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5";
+ sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7";
+ sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59";
+ sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d925838e642c..e0bedeb2f045 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
-, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, fetchpatch
+, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip
, hunspell, libevent, libstartup_notification
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "60.0";
+ version = "60.2.1";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya";
+ sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp";
};
# from firefox, but without sound libraries
@@ -47,6 +47,16 @@ in stdenv.mkDerivation rec {
# from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
+ # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
+ # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
+ patches = [
+ (fetchpatch {
+ name = "bc651d3d910c.patch";
+ url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
+ sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
+ })
+ ];
+
configureFlags =
[ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
"--enable-application=comm/mail"
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index b7bad13a30d8..86c8b6db2c47 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
let
common = { stname, target, patches ? [], postInstall ? "" }:
stdenv.mkDerivation rec {
- version = "0.14.50";
+ version = "0.14.51";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "10lilw20mq1zshysb9zrszcpl4slyyxvnbxfqk04nhz0b1gmm9ri";
+ sha256 = "1ycly3vh10s04pk0fk9hb0my7w5b16dfgmnk1mi0zjylcii3yzi5";
};
inherit patches;
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix
new file mode 100644
index 000000000000..0ee6d45e369a
--- /dev/null
+++ b/pkgs/applications/networking/tsung/default.nix
@@ -0,0 +1,50 @@
+{ fetchurl, stdenv, lib, makeWrapper,
+ erlang,
+ python2, python2Packages,
+ perl, perlPackages,
+ gnuplot }:
+
+stdenv.mkDerivation rec {
+ name = "tsung-${version}";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
+ sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
+ };
+
+ buildInputs = [ makeWrapper ];
+ propagatedBuildInputs = [
+ erlang
+ gnuplot
+ perl
+ perlPackages.TemplateToolkit
+ python2
+ python2Packages.matplotlib
+ ];
+
+
+ postFixup = ''
+ # Make tsung_stats.pl accessible
+ # Leaving .pl at the end since all of tsung documentation is refering to it
+ # as tsung_stats.pl
+ ln -s $out/lib/tsung/bin/tsung_stats.pl $out/bin/tsung_stats.pl
+
+ # Add Template Toolkit and gnuplot to tsung_stats.pl
+ wrapProgram $out/bin/tsung_stats.pl \
+ --prefix PATH : ${lib.makeBinPath [ gnuplot ]} \
+ --set PERL5LIB "${lib.makePerlPath [ perlPackages.TemplateToolkit ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://tsung.erlang-projects.org/";
+ description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc.";
+ longDescription = ''
+ Tsung is a distributed load testing tool. It is protocol-independent and
+ can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL,
+ AMQP, MQTT, LDAP and Jabber/XMPP servers.
+ '';
+ license = licenses.gpl2;
+ maintainers = [ maintainers.uskudnik ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 4de4752aefc1..dcb76320a9b5 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "sep18a";
- version = "20180901_a";
+ srcVersion = "oct18a";
+ version = "20181001_a";
name = "gildas-${version}";
src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
- sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956";
+ sha256 = "091941a74kaw3xqsmqda7bj972cafi8ppj2c5xq0mca2c075dyfx";
};
enableParallelBuilding = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
- patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
+ patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
deleted file mode 100644
index 61ddc37c7fd4..000000000000
--- a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
---- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200
-+++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200
-@@ -29,7 +29,8 @@
-
- SEDEXE=sed -e 's?source tree?executable tree?g'
-
--$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
-+$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
-+ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
- ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
- $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
- else
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 675c7d4eb0b4..73f70efc14d1 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.2";
+ version = "2.3.4.3";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BenLangmead";
repo = pname;
rev = "v${version}";
- sha256 = "1gsfaf7rjg4nwhs7vc1vf63xd5r5v1yq58w7x3barycplzbvixzz";
+ sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp";
};
buildInputs = [ zlib tbb ];
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index fd6240fe1b21..986c4a1f32a1 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
- version = "3.926";
+ version = "4.002";
src = fetchurl {
url = "https://www.veripool.org/ftp/${name}.tgz";
- sha256 = "0f4ajj1gmxskid61qj1ql1rzc3cmn1x2fpgqrbg7x3gszz61c9gr";
+ sha256 = "10g1814kq07a2818p0lmvacy1a6shbc0k6z16wdgas4h5x1n4f43";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 2b7cb9c30fae..f0b912c57fc5 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
name = "elan-${version}";
- version = "0.5.0";
+ version = "0.7.1";
- cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
+ cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1";
src = fetchFromGitHub {
owner = "kha";
repo = "elan";
rev = "v${version}";
- sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
+ sha256 = "0x5s1wm78yx5ci63wrmlkzm6k3281p33gn4dzw25k5s4vx0p9n24";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 946f65d944b3..e21c274370c8 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "symbiyosys-${version}";
- version = "2018.07.26";
+ version = "2018.09.12";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "symbiyosys";
- rev = "2fef25f93dd1cb5137a08e71f507e3eee8100fb1";
- sha256 = "103fga0n11h4n2q346xyz3k0615d9lgx2b8sqr1pwn2hx26kchav";
+ rev = "e90bcb588e97118af0cdba23fae562fb0efbf294";
+ sha256 = "16nlimpdc3g6lghwqpyirgrr1d9mgk4wg3c06fvglzaicvjixnfr";
};
buildInputs = [ python3 yosys ];
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 9d95960bde27..ff6b2d0ad2d1 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
name = "calc-${version}";
- version = "2.12.6.6";
+ version = "2.12.6.8";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
];
- sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
+ sha256 = "144am0pra3hh7635fmi7kqynba8z246dx1dzclm9qx965p3xb4hb";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index d7b4707420be..9639376fbda3 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "nauty-${version}";
- version = "26r10";
+ version = "26r11";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
- sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6";
+ sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
};
buildInputs = [];
installPhase = ''
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 5dc0c48b0f78..a2ebb8195db4 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -1,29 +1,33 @@
-{stdenv, lib, fetchurl, python2, cvs, makeWrapper}:
+{ lib, fetchurl, makeWrapper
+, python2Packages
+, cvs, subversion, git, bazaar
+}:
-stdenv.mkDerivation rec {
- name = "cvs2svn-2.4.0";
+python2Packages.buildPythonApplication rec {
+ name = "cvs2svn-${version}";
+ version = "2.5.0";
src = fetchurl {
- url = "http://cvs2svn.tigris.org/files/documents/1462/49237/${name}.tar.gz";
- sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6";
+ url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz";
+ sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
- buildInputs = [python2 makeWrapper];
+ buildInputs = [ makeWrapper ];
- dontBuild = true;
- installPhase = ''
- python ./setup.py install --prefix=$out
+ checkInputs = [ subversion git bazaar ];
+
+ checkPhase = "python run-tests.py";
+
+ doCheck = false; # Couldn't find node 'transaction...' in expected output tree
+
+ postInstall = ''
for i in bzr svn git; do
wrapProgram $out/bin/cvs2$i \
- --prefix PATH : "${lib.makeBinPath [ cvs ]}" \
- --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
+ --prefix PATH : "${lib.makeBinPath [ cvs ]}"
done
'';
- /* !!! maybe we should absolutise the program names in
- $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A tool to convert CVS repositories to Subversion repositories";
homepage = http://cvs2svn.tigris.org/;
maintainers = [ maintainers.makefu ];
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 88746f5eba84..5ae10dd68b61 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -4,7 +4,6 @@
args @ {config, lib, pkgs}: with args; with pkgs;
let
gitBase = callPackage ./git {
- texinfo = texinfo5;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 6cc109c48c75..8bd6457a9e50 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.18.0";
+ version = "2.19.0";
svn = subversionClient.override { perlBindings = perlSupport; };
in
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
+ sha256 = "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq";
};
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@@ -283,7 +283,7 @@ EOF
# XXX: I failed to understand why this one fails.
# Could someone try to re-enable it on the next release ?
- # Tested to fail: 2.18.0
+ # Tested to fail: 2.18.0 and 2.19.0
disable_test t1700-split-index "null sha1"
# Tested to fail: 2.18.0
@@ -292,6 +292,9 @@ EOF
# Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options"
+
+ # As of 2.19.0, t5562 refers to #!/usr/bin/perl
+ patchShebangs t/t5562/invoke-with-content-length.pl
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
# Test fails (as of 2.17.0, musl 1.1.19)
disable_test t3900-i18n-commit
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 3b4e3a452111..962ddf98d6ce 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -21,7 +21,7 @@ buildGo19Package {
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
meta = with stdenv.lib; {
- description = " GRV is a terminal interface for viewing git repositories";
+ description = "GRV is a terminal interface for viewing Git repositories";
homepage = https://github.com/rgburke/grv;
license = licenses.gpl3;
platforms = platforms.unix;
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 64e700273d12..4cc1a6f78dfa 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, git }:
+{ stdenv, fetchFromGitHub, python2, git }:
let
name = "stgit-${version}";
@@ -7,9 +7,11 @@ in
stdenv.mkDerivation {
inherit name;
- src = fetchurl {
- url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz";
- sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00";
+ src = fetchFromGitHub {
+ owner = "ctmarinas";
+ repo = "stgit";
+ rev = "v${version}";
+ sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
};
buildInputs = [ python2 git ];
@@ -24,12 +26,11 @@ stdenv.mkDerivation {
doCheck = false;
checkTarget = "test";
- meta = {
- homepage = http://procode.org/stgit/;
+ meta = with stdenv.lib; {
description = "A patch manager implemented on top of Git";
- license = "GPL";
-
- maintainers = with stdenv.lib.maintainers; [ the-kenny ];
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://procode.org/stgit/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ the-kenny ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 3f05bd08f3f4..a37b4b7b05c0 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -11,7 +11,7 @@ in buildPythonApplication rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r";
};
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 9d843a3bfefb..62a517e80ea6 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, fetchFromGitHub, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs
, lua, luasocket, libuchardet, libiconv ? null, darwin
@@ -89,22 +89,15 @@ let
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.29.0";
+ version = "0.29.1";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3";
+ sha256 = "138921kx8g6qprim558xin09xximjhsj9ss8b71ifg2m6kclym8m";
};
- # FIXME: Remove this patch for building on macOS if it gets released in
- # the future.
- patches = optional stdenv.isDarwin (fetchpatch {
- url = https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch;
- sha256 = "0pa8vlb8rsxvd1s39c4iv7gbaqlkn3hx21a6xnpij99jdjkw3pg8";
- });
-
postPatch = ''
patchShebangs ./TOOLS/
'';
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index adb5d237f54f..57ee1cf12750 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -26,7 +26,7 @@ in python3Packages.buildPythonApplication rec {
name = "pitivi-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69";
};
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fa1ddcf810b7..8c775833c28a 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb,
xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon,
- libxkbfile, libjpeg_turbo
+ libxkbfile, libjpeg_turbo, xcbutilxrm
}:
stdenv.mkDerivation rec {
- version = "2.11-c";
+ version = "2.12.c";
name = "i3lock-color-${version}";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
- sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw";
+ sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
- libev cairo libxkbcommon libxkbfile libjpeg_turbo ];
+ libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ];
makeFlags = "all";
preInstall = ''
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 366657b8827e..0e3168a5782d 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,21 +1,21 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, gperftools }:
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus }:
rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}";
- version = "0.9.0.2018-09-30";
+ version = "0.9.0.2018-10-02";
src = fetchFromGitHub {
owner = "greshake";
repo = "i3status-rust";
- rev = "82ea033250c3fc51a112ac68c389da5264840492";
- sha256 = "06r1nnv3a5vq3s17rgavq639wrq09z0nd2ck50bj1c8i2ggkpvq9";
+ rev = "11c2a21693ffcd0b6c2e0ac919b2232918293963";
+ sha256 = "019m9qpw7djq6g7lzbm7gjcavlgsp93g3cd7cb408nxnfsi7i9dp";
};
- cargoSha256 = "02in0hz2kgbmrd8i8s21vbm9pgfnn4axcji5f2a14pha6lx5rnvv";
+ cargoSha256 = "1wnify730f7c3cb8wllqvs7pzrq54g5x81xspvz5gq0iqr0q38zc";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ dbus gperftools ];
+ buildInputs = [ dbus ];
meta = with stdenv.lib; {
description = "Very resource-friendly and feature-rich replacement for i3status";
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
new file mode 100644
index 000000000000..546589623cbd
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, rustPlatform,
+ xorg, python3, pkgconfig, cairo, libxkbcommon }:
+let
+ pname = "wmfocus";
+ version = "1.0.2";
+in
+rustPlatform.buildRustPackage {
+ inherit pname version;
+ name = "${pname}-${version}";
+
+ nativeBuildInputs = [ python3 pkgconfig ];
+ buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
+
+ # For now, this is the only available featureset. This is also why the file is
+ # in the i3 folder, even though it might be useful for more than just i3
+ # users.
+ cargoBuildFlags = ["--features i3"];
+
+ src = fetchFromGitHub {
+ owner = "svenstaro";
+ repo = pname;
+ rev = version;
+ sha256 = "14yxg2jiqx7gng677sbmvv0a0msb9wpvp3qh8h3nkq0vi17ds668";
+ };
+
+ cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg";
+
+ meta = with stdenv.lib; {
+ description = ''
+ Tool that allows you to rapidly choose a specific window directly
+ without having to use the mouse or directional keyboard navigation.
+ '';
+ maintainers = with maintainers; [ synthetica ];
+ platforms = platforms.linux;
+ license = licenses.mit;
+ homepage = https://github.com/svenstaro/wmfocus;
+ };
+}
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 7948f726c629..f9ca245beea6 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -6,9 +6,10 @@
# compiler and the linker just "work".
{ name ? ""
-, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
-, bintools ? null, libc ? null
-, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
+, stdenvNoCC
+, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
+, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, propagateDoc ? bintools != null && bintools ? man
, extraPackages ? [], extraBuildCommands ? ""
, buildPackages ? {}
, useMacosReexportHack ? false
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 07d37451ddf9..28247bac1021 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -25,7 +25,13 @@ in stdenv.mkDerivation (fBuildAttrs // {
buildPhase = fFetchAttrs.buildPhase or ''
runHook preBuild
- bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
+ # Bazel computes the default value of output_user_root before parsing the
+ # flag. The computation of the default value involves getting the $USER
+ # from the environment. I don't have that variable when building with
+ # sandbox enabled. Code here
+ # https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
+ #
+ USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
runHook postBuild
'';
@@ -33,10 +39,19 @@ in stdenv.mkDerivation (fBuildAttrs // {
installPhase = fFetchAttrs.installPhase or ''
runHook preInstall
+ # Remove all built in external workspaces, Bazel will recreate them when building
+ rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
+ rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
+ rm -rf $bazelOut/external/{local_*,\@local_*}
+
# Patching markers to make them deterministic
- for i in $bazelOut/external/\@*.marker; do
- sed -i 's, -\?[0-9][0-9]*$, 1,' "$i"
- done
+ sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker
+
+ # Remove all vcs files
+ rm -rf $(find $bazelOut/external -type d -name .git)
+ rm -rf $(find $bazelOut/external -type d -name .svn)
+ rm -rf $(find $bazelOut/external -type d -name .hg)
+
# Patching symlinks to remove build directory reference
find $bazelOut/external -type l | while read symlink; do
ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 301bc2694c4f..e59758371a38 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -6,8 +6,10 @@
# compiler and the linker just "work".
{ name ? ""
-, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, stdenvNoCC
, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
+, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, propagateDoc ? cc != null && cc ? man
, extraPackages ? [], extraBuildCommands ? ""
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, buildPackages ? {}
diff --git a/pkgs/build-support/rust/cargo-vendor-normalise.py b/pkgs/build-support/rust/cargo-vendor-normalise.py
new file mode 100755
index 000000000000..2d7a18957184
--- /dev/null
+++ b/pkgs/build-support/rust/cargo-vendor-normalise.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+import sys
+
+import toml
+
+
+def quote(s: str) -> str:
+ escaped = s.replace('"', r"\"").replace("\n", r"\n").replace("\\", "\\\\")
+ return '"{}"'.format(escaped)
+
+
+def main() -> None:
+ data = toml.load(sys.stdin)
+
+ assert list(data.keys()) == ["source"]
+
+ # this value is non deterministic
+ data["source"]["vendored-sources"]["directory"] = "@vendor@"
+
+ lines = []
+ inner = data["source"]
+ for source, attrs in sorted(inner.items()):
+ lines.append("[source.{}]".format(quote(source)))
+ if source == "vendored-sources":
+ lines.append('"directory" = "@vendor@"\n')
+ else:
+ for key, value in sorted(attrs.items()):
+ attr = "{} = {}".format(quote(key), quote(value))
+ lines.append(attr)
+ lines.append("")
+
+ result = "\n".join(lines)
+ real = toml.loads(result)
+ assert real == data, "output = {} while input = {}".format(real, data)
+
+ print(result)
+
+
+if __name__ == "__main__":
+ main()
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 820989a76206..1d5de052f893 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
let
fetchcargo = import ./fetchcargo.nix {
- inherit stdenv cacert git rust cargo-vendor;
+ inherit stdenv cacert git rust cargo-vendor python3;
};
in
{ name, cargoSha256 ? "unset"
@@ -61,14 +61,12 @@ in stdenv.mkDerivation (args // {
${setupVendorDir}
mkdir .cargo
- cat >.cargo/config <<-EOF
- [source.crates-io]
- registry = 'https://github.com/rust-lang/crates.io-index'
- replace-with = 'vendored-sources'
-
- [source.vendored-sources]
- directory = '$(pwd)/$cargoDepsCopy'
- EOF
+ config="$(pwd)/$cargoDepsCopy/.cargo/config";
+ if [[ ! -e $config ]]; then
+ config=${./fetchcargo-default-config.toml};
+ fi;
+ substitute $config .cargo/config \
+ --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
unset cargoDepsCopy
diff --git a/pkgs/build-support/rust/fetchcargo-default-config.toml b/pkgs/build-support/rust/fetchcargo-default-config.toml
new file mode 100755
index 000000000000..dd8ebbc32d31
--- /dev/null
+++ b/pkgs/build-support/rust/fetchcargo-default-config.toml
@@ -0,0 +1,7 @@
+[source."crates-io"]
+"replace-with" = "vendored-sources"
+
+[source."vendored-sources"]
+"directory" = "@vendor@"
+
+
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 2670ed528640..9e77f8817b24 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,8 +1,26 @@
-{ stdenv, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
+let cargo-vendor-normalise = stdenv.mkDerivation {
+ name = "cargo-vendor-normalise";
+ src = ./cargo-vendor-normalise.py;
+ nativeBuildInputs = [ python3.pkgs.wrapPython ];
+ unpackPhase = ":";
+ installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
+ pythonPath = [ python3.pkgs.toml ];
+ postFixup = "wrapPythonPrograms";
+ doInstallCheck = true;
+ installCheckPhase = ''
+ # check that ./fetchcargo-default-config.toml is a fix point
+ reference=${./fetchcargo-default-config.toml}
+ < $reference $out/bin/cargo-vendor-normalise > test;
+ cmp test $reference
+ '';
+ preferLocalBuild = true;
+};
+in
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
- nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ];
+ nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise rust.cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";
@@ -23,9 +41,16 @@ stdenv.mkDerivation {
${cargoUpdateHook}
- cargo vendor
-
- cp -ar vendor $out
+ mkdir -p $out
+ cargo vendor $out | cargo-vendor-normalise > config
+ # fetchcargo used to never keep the config output by cargo vendor
+ # and instead hardcode the config in ./fetchcargo-default-config.toml.
+ # This broke on packages needing git dependencies, so now we keep the config.
+ # But not to break old cargoSha256, if the previous behavior was enough,
+ # we don't store the config.
+ if ! cmp config ${./fetchcargo-default-config.toml} > /dev/null; then
+ install -Dt $out/.cargo config;
+ fi;
'';
outputHashAlgo = "sha256";
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 1433d1e1f144..d5586fccae67 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -32,7 +32,7 @@ patchShebangs() {
# - options: something starting with a '-'
# - environment variables: foo=bar
if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
- echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+ echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
exit 1
fi
newPath="$(command -v "$arg0" || true)"
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d2acc2679afa..7543433640a3 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -12,15 +12,40 @@ in
rec {
- # Run the shell command `buildCommand' to produce a store path named
- # `name'. The attributes in `env' are added to the environment
- # prior to running the command.
+ /* Run the shell command `buildCommand' to produce a store path named
+ * `name'. The attributes in `env' are added to the environment
+ * prior to running the command. By default `runCommand' runs using
+ * stdenv with no compiler environment. `runCommandCC`
+ *
+ * Examples:
+ * runCommand "name" {envVariable = true;} ''echo hello''
+ * runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior
+ * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
+ */
runCommand = runCommandNoCC;
runCommandNoCC = runCommand' stdenvNoCC;
runCommandCC = runCommand' stdenv;
- # Create a single file.
+ /* Writes a text file to the nix store.
+ * The contents of text is added to the file in the store.
+ *
+ * Examples:
+ * # Writes my-file to /nix/store/
+ * writeTextFile "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ * # Writes executable my-file to /nix/store//bin/my-file
+ * writeTextFile "my-file"
+ * ''
+ * Contents of File
+ * ''
+ * true
+ * "/bin/my-file";
+ * true
+ */
writeTextFile =
{ name # the name of the derivation
, text
@@ -51,13 +76,69 @@ rec {
'';
- # Shorthands for `writeTextFile'.
+ /*
+ * Writes a text file to nix store with no optional parameters available.
+ *
+ * Example:
+ * # Writes contents of file to /nix/store/
+ * writeText "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
writeText = name: text: writeTextFile {inherit name text;};
+ /*
+ * Writes a text file to nix store in a specific directory with no
+ * optional parameters available. Name passed is the destination.
+ *
+ * Example:
+ * # Writes contents of file to /nix/store//
+ * writeTextDir "share/my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
+ /*
+ * Writes a text file to /nix/store/ and marks the file as executable.
+ *
+ * Example:
+ * # Writes my-file to /nix/store//bin/my-file and makes executable
+ * writeScript "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
writeScript = name: text: writeTextFile {inherit name text; executable = true;};
+ /*
+ * Writes a text file to /nix/store//bin/ and
+ * marks the file as executable.
+ *
+ * Example:
+ * # Writes my-file to /nix/store//bin/my-file and makes executable.
+ * writeScript "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
- # Create a Shell script, check its syntax
+ /*
+ * Writes a Shell script and check its syntax. Automatically includes interpreter
+ * above the contents passed.
+ *
+ * Example:
+ * # Writes my-file to /nix/store//bin/my-file and makes executable.
+ * writeScript "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
writeShellScriptBin = name : text :
writeTextFile {
inherit name;
@@ -90,7 +171,18 @@ rec {
$CC -x c code.c -o "$n"
'';
- # Create a forest of symlinks to the files in `paths'.
+ /*
+ * Create a forest of symlinks to the files in `paths'.
+ *
+ * Examples:
+ * # adds symlinks of hello to current build.
+ * { symlinkJoin, hello }:
+ * symlinkJoin { name = "myhello"; paths = [ hello ]; }
+ *
+ * # adds symlinks of hello to current build and prints "links added"
+ * { symlinkJoin, hello }:
+ * symlinkJoin { name = "myhello"; paths = [ hello ]; postBuild = "echo links added"; }
+ */
symlinkJoin =
args_@{ name
, paths
@@ -112,7 +204,23 @@ rec {
'';
- # Make a package that just contains a setup hook with the given contents.
+ /*
+ * Make a package that just contains a setup hook with the given contents.
+ * This setup hook will be invoked by any package that includes this package
+ * as a buildInput. Optionally takes a list of substitutions that should be
+ * applied to the resulting script.
+ *
+ * Examples:
+ * # setup hook that depends on the hello package and runs ./myscript.sh
+ * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh;
+ *
+ * # wrotes a setup hook where @bash@ myscript.sh is substituted for the
+ * # bash interpreter.
+ * myhellohookSub = makeSetupHook {
+ * deps = [ hello ];
+ * substitutions = { bash = "${pkgs.bash}/bin/bash"; };
+ * } ./myscript.sh;
+ */
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {} }: script:
runCommand name substitutions
(''
@@ -126,6 +234,7 @@ rec {
# Write the references (i.e. the runtime dependencies in the Nix store) of `path' to a file.
+
writeReferencesToFile = path: runCommand "runtime-deps"
{
exportReferencesGraph = ["graph" path];
@@ -141,8 +250,17 @@ rec {
'';
- # Quickly create a set of symlinks to derivations.
- # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; }
+ /*
+ * Quickly create a set of symlinks to derivations.
+ * entries is a list of attribute sets like
+ * { name = "name" ; path = "/nix/store/..."; }
+ *
+ * Example:
+ *
+ * # Symlinks hello path in store to current $out/hello
+ * linkFarm "hello" entries = [ { name = "hello"; path = pkgs.hello; } ];
+ *
+ */
linkFarm = name: entries: runCommand name { preferLocalBuild = true; }
("mkdir -p $out; cd $out; \n" +
(lib.concatMapStrings (x: ''
@@ -151,9 +269,20 @@ rec {
'') entries));
- # Print an error message if the file with the specified name and
- # hash doesn't exist in the Nix store. Do not use this function; it
- # produces packages that cannot be built automatically.
+ /* Print an error message if the file with the specified name and
+ * hash doesn't exist in the Nix store. This function should only
+ * be used by non-redistributable software with an unfree license
+ * that we need to require the user to download manually. It produces
+ * packages that cannot be built automatically.
+ *
+ * Examples:
+ *
+ * requireFile {
+ * name = "my-file";
+ * url = "http://example.com/download/";
+ * sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff";
+ * }
+ */
requireFile = { name ? null
, sha256 ? null
, sha1 ? null
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index e9225900cb7b..63fe26f069c7 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "zeal-${version}";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "v${version}";
- sha256 = "0zsrb89jz04b8in1d69p7mg001yayyljc47vdlvm48cjbhvxwj0k";
+ sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v";
};
# while ads can be disabled from the user settings, by default they are not so
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 9d002ef02ade..7a0b8559b593 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81";
};
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 191e52c427a7..b0b58b0ebfcc 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "1.205";
+ version = "1.206";
in fetchzip {
name = "fira-code-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
- sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms";
+ sha256 = "0074d8q4m802f5yms8yxdx4rdz5xnpgv1w5hs330zg2p9ksicgzy";
meta = with stdenv.lib; {
homepage = https://github.com/tonsky/FiraCode;
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix
new file mode 100644
index 000000000000..80516eb0293c
--- /dev/null
+++ b/pkgs/data/fonts/hyperscrypt/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchzip, lib }:
+
+let
+ version = "1.1";
+ pname = "HyperScrypt";
+in
+
+fetchzip rec {
+ name = "${lib.toLower pname}-font-${version}";
+ url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip";
+ sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m";
+ postFetch = ''
+ mkdir -p $out/share/fonts/{truetype,opentype}
+ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf
+ unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://velvetyne.fr/fonts/hyper-scrypt/;
+ description = "A modern stencil typeface inspired by stained glass technique";
+ longDescription = ''
+ The Hyper Scrypt typeface was designed for the Hyper Chapelle
+ exhibition. It was commissioned by AAAAA Atelier to Studio
+ Triple's designer Jérémy Landes. Hyper Scrypt is a modern
+ stencil typeface inspired by the stained glass technique used in
+ the Metz cathedral. It borrows the stained glass method, drawing
+ holes for the light with black lead. This creates a reverse
+ typeface, where the shapes of the letters are drawn by their
+ counters. Hyper Scrypt is at the intersection between 3 metals :
+ the sacred lead of stained glass, the lead of print characters
+ and the heavy metal. Despite its organic look inherited for the
+ molted metal, Hyper Scrypt is based upon a rigorous grid,
+ allowing some neat alignements between shapes in multi lines
+ layouts.
+ '';
+ license = licenses.ofl;
+ maintainers = with maintainers; [ leenaars ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index c457a8c69ec8..d4a15a105cd3 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "elementary-xfce-icon-theme-${version}";
- version = "0.13";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = "elementary-xfce";
rev = "v${version}";
- sha256 = "01hlpw4vh4kgyghki01jp0snbn0g79mys28fb1m993mivnlzmn75";
+ sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
};
nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index b033f510f0b9..ee45a186f290 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "iconpack-obsidian-${version}";
- version = "4.0.1";
+ version = "4.3";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "iconpack-obsidian";
rev = "v${version}";
- sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab";
+ sha256 = "0np2s4mbaykwwv516959r5d9gfdmqb5hadsx18x2if4751a9qz49";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index e6c33fc260e8..af8270e6eefa 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchzip }:
let
- version = "20180711";
+ version = "20180905";
in fetchzip {
name = "iana-etc-${version}";
-
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "0vbgk3paix2v4rlh90a8yh1l39s322awng06izqj44zcg704fjbj";
+ sha256 = "1vl3by24xddl267cjq9bcwb7yvfd7gqalwgd5sgx8i7kz9bk40q2";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 513948d3b51f..feb865743e6c 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
};
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 38c729a1c429..46c76a8ce17c 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "bijiben-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0lg92fl6dmrybkxs3gqhyr8rq945y64k51l6s72yiads7pqabli2";
};
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 9da265e75d67..ab985b1473e3 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw";
};
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index fab175526b1c..8fb8c2307841 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "evolution-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1q1nfga39f44knrcvcxk8ivhl6fvg92g71cq3hcp4a7krb3jwa5v";
};
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index bd97393b7b69..1066cea177aa 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "09y2blmlsccfxc2npcayhicq00r9n03897s1aizkahn1m970hjsp";
};
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 919ebdd77d17..64ef45f3098f 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i";
};
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
index 1f8077ff4af8..d9f1e7850afd 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.18.3";
src = fetchurl {
- url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
};
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index a1777137c019..c4be9d7259c6 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.22.1";
src = fetchurl {
- url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index b6679ccc2695..9a9c01fbb1a6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1z1qimspx1nw7l79rardxcx2bydj9nmk60vsdb611xzlqa3hkppm";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 05275fa01ac5..d876569d4df9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 8b497fbf433d..20154359c086 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 78366755ad6a..9943bc778edf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e600284550b7..a62965b890af 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index c8a8f8e7e322..de54b6f92e11 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 18f7f9f6fd4e..421ef8930c52 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.5";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0zw6nx1hckv46hn978g57anp4zq4alvz9dpwibgx02wb6gq1r23a";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index cade274e69a8..65270b7124d3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index eef91ec0fbb8..6602987db374 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 2163e6e875e7..2da382e57223 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index a7861dcf74d9..58c67e6441f1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index 60953d99ac27..1f6e86d49436 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0y0srj1hvr1waa35p6dj1r1mlgcsscc0i99jni50ijp4zb36fjqy";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 3a9f33f46f00..37b48a744822 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index ad759bf5506a..93c8d4147641 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.26.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index dcdf43b15165..3bb4b7887446 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1066j1lbrkpcxhvrg3gcv7gv8dzqv5ny9qi9dnm8r1dsx2hil9yc";
};
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 1bcf77839007..179b60e98c13 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
};
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index a8fe76ee03f9..00037f526b64 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 049b586f16db..ce596ec628ec 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
};
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 693e284e2700..8d21e9c323b5 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
};
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index acfd6dfb3745..fe2b50f296a4 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 13d73fa34d2f..8eacbb037dd1 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
};
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 71779c172807..219aa4e7475f 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "0.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
};
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 089c32d602ea..f4aeb6c53db2 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
version = "3.25.90";
src = fetchurl {
- url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
};
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 8459ba2c126b..bf5465b16c2e 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
};
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 01232b0f9977..3c9b4de9ea8b 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "3.28.3.1";
src = fetchurl {
- url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9";
};
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 74f10cc384d7..077ffe65ec47 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89";
};
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index c355c9bbce69..6ed27750dccd 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1247gv0ggwnd1i2n7iglb3crfapx6s9nrl896bzy9k87fb94hlyr";
};
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 981b8504487b..ec059873dcbf 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "folks-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/folks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
};
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index a324fda0a7e1..ea2883a5716a 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gcr/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
};
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 6c810eb46342..388fa89acaab 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.3";
src = fetchurl {
- url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "12d1cp2dyca8rwh9y9cg8xn6grdp8nmxkkqwg4xpkr8i8ml65n88";
};
@@ -37,13 +37,27 @@ stdenv.mkDerivation rec {
# Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [
+ # Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
inherit coreutils plymouth xwayland;
})
+
+ # The following patches implement certain environment variables in GDM which are set by
+ # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix).
+
+ # Look for session definition files in the directory specified by GDM_SESSIONS_DIR.
./sessions_dir.patch
+
+ # Allow specifying X server arguments with GDM_X_SERVER_EXTRA_ARGS.
./gdm-x-session_extra_args.patch
- ./gdm-session-worker_xserver-path.patch
+
+ # Allow specifying a wrapper for running the session command.
+ ./gdm-x-session_session-wrapper.patch
+
+ # Forwards certain environment variables to the gdm-x-session child process
+ # to ensure that the above two patches actually work.
+ ./gdm-session-worker_forward-vars.patch
];
installFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
new file mode 100644
index 000000000000..401b6aea0c28
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
@@ -0,0 +1,31 @@
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 9ef4c5b..94da834 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker)
+ g_object_unref (dir);
+ }
+
++static void
++gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var)
++{
++ char const *value = g_getenv(var);
++ if (value != NULL) {
++ g_debug ("forwarding %s= %s", var, value);
++ gdm_session_worker_set_environment_variable(worker, var, value);
++ }
++}
++
+ static gboolean
+ gdm_session_worker_accredit_user (GdmSessionWorker *worker,
+ GError **error)
+@@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker,
+ goto out;
+ }
+
++ gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS");
++ gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER");
++
+ gdm_session_worker_update_environment_from_passwd_info (worker,
+ uid,
+ gid,
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
deleted file mode 100644
index d020752fef3a..000000000000
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session-worker.c.orig b/daemon/gdm-session-worker.c
-index 7bbda49..592691d 100644
---- a/daemon/gdm-session-worker.c.orig
-+++ b/daemon/gdm-session-worker.c
-@@ -1557,6 +1557,12 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker,
- goto out;
- }
-
-+ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) {
-+ g_debug ("forwarding GDM_X_SERVER_EXTRA_ARGS= %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
-+ gdm_session_worker_set_environment_variable (worker, "GDM_X_SERVER_EXTRA_ARGS",
-+ g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
-+ }
-+
- gdm_session_worker_update_environment_from_passwd_info (worker,
- uid,
- gid,
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
new file mode 100644
index 000000000000..58481f0730fa
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
@@ -0,0 +1,40 @@
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index 88fe96f..b1b140a 100644
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -664,18 +664,34 @@ spawn_session (State *state,
+ state->session_command,
+ NULL);
+ } else {
++ char const *session_wrapper;
++ char *eff_session_command;
+ int ret;
+ char **argv;
+
+- ret = g_shell_parse_argv (state->session_command,
++ session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER");
++ if (session_wrapper != NULL) {
++ char *quoted_wrapper = g_shell_quote(session_wrapper);
++ eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL);
++ g_free(quoted_wrapper);
++ } else {
++ eff_session_command = state->session_command;
++ }
++
++ ret = g_shell_parse_argv (eff_session_command,
+ NULL,
+ &argv,
+ &error);
+
++ if (session_wrapper != NULL) {
++ g_free(eff_session_command);
++ }
++
+ if (!ret) {
+ g_debug ("could not parse session arguments: %s", error->message);
+ goto out;
+ }
++
+ subprocess = g_subprocess_launcher_spawnv (launcher,
+ (const char * const *) argv,
+ &error);
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index f48e9b3b1218..3924f0033465 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
- url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
};
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 1bf640f713f7..5854265d3527 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.52.3";
src = fetchurl {
- url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index c52fe5c60492..c1f8c08eebfe 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index e7acbe8706ec..946e7adff793 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 2f4743ee2633..a5a3bd03e9f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index 9fcbbe814dce..7fe1c2211e2e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index 23fd157a528a..d0ab339a504d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.18.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a9541d64b03c..effb3d521ef6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "gnome-contacts-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 6a57e4cdff48..638c5fe9941a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index d6402a3b5b6c..597f45261a68 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index ee1feb6ddaeb..1019a809d7f8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.26.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index a572e617766e..587bd38f16b6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 6af2f7f4b03f..06a5b258c80f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.30.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index cce192c9f29d..9d9c874319cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 4bd2dcbe13e8..023e7b2ce72f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 1df5465382a9..86e5fba36507 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.26.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index c92280ed5663..21c28f0e9534 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 1882f19bb223..57bcd826038d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -7,15 +7,14 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
- # FIXME: glib binaries shouldn't be in .dev!
- gsettings = "${glib.dev}/bin/gsettings";
+ gsettings = "${glib.bin}/bin/gsettings";
dbusLaunch = "${dbus.lib}/bin/dbus-launch";
})
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index bfaf430d5932..ce025899c806 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index a963ea148bad..9609cd537964 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 8e09c960e75e..2b2572ac632a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
version = "3.28.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0xm2a8inj2zkrpgkhy69rbqh44q62gpwm4javzbvvvgx0srza90w";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 6172f2165439..248acfd17896 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index c402a2edd8fb..7bee6f3a8809 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index a0318514c9b9..13442af337a3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index 0503d3baa6c1..d42797300e61 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1938c90a8254..d17be1e7182a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
};
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
meta = with stdenv.lib; {
- homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+ homepage = https://help.gnome.org/users/gnome-help/;
description = "User and system administration help for the GNOME desktop";
maintainers = gnome3.maintainers;
license = licenses.cc-by-30;
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 5ae579417aec..6a5d2fde5018 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09";
};
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index de547ea172d0..f03259c35409 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -5,7 +5,7 @@
let
pname = "grilo-plugins";
version = "0.3.7";
- major = gnome3.versionBranch version;
+ major = stdenv.lib.versions.majorMinor version;
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 5554cddd043b..de50cc69ed03 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
outputBin = "dev";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14cwpk9jxi8rfjcmkav37zf0m52b1lqpkpkz858h80jqvn1clr8y";
};
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index 5dc6137c9fca..657a40d1805e 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c";
};
diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
index 4978223c9b2b..4468ce78f404 100644
--- a/pkgs/desktops/gnome-3/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsound/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
};
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index 0a37144d8f74..15e9ac41d6c6 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.21.3";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
};
diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix
index f5ecf088a87c..312231f648f3 100644
--- a/pkgs/desktops/gnome-3/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
};
diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index f430986cc474..be32528ef6c0 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
};
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a65d0f401f0e..ea0860a3c4e4 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
};
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index f43b1de46e50..ad7d2a8ebd43 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
};
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index 8f77944577ee..867e08de00ec 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
};
diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
index 6301f6f4ab65..a9b27fa65a47 100644
--- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.26.0";
src = fetchurl {
- url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/libgnomekbd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
};
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 23405af50d3b..b0d3679b1b71 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
};
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index 65f8090e4ead..c9312c228829 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
};
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index d4ca0e509ddd..03c79a27d818 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/libpeas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
};
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 10c6185fa821..42a7832a2419 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
};
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index b05644366dc0..a08e0fd3cd1a 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.3";
src = fetchurl {
- url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
};
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 33beb8a87d37..498f6d35b176 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w";
};
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
index aeef5114435d..b00e4c623d2a 100644
--- a/pkgs/desktops/gnome-3/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/core/rest/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
};
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 8596a059ca5d..3d7e78fa18df 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a";
};
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 100a2727fc3c..1881293a2134 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.3";
src = fetchurl {
- url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw";
};
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 279e7f2e95af..cb10213631ce 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.26.1";
src = fetchurl {
- url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/totem-pl-parser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka";
};
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 50e060c13c3a..2082dc0ac059 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "3.26.2";
src = fetchurl {
- url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g";
};
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index ad5b40d3c088..1f28c9f0fd05 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
version = "2.1.3";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz";
};
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 38e0d7cfa502..c53324dd9b3b 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
};
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 65c6ace8eec0..6ec2b0a17edb 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
};
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 47a2c2f19d3b..3fff1dab39c8 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "0.52.2";
src = fetchurl {
- url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg";
};
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 5a0a5bd43b5b..6f487eacf972 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2";
};
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 6abaff8e32be..e5ed1f31d703 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc";
};
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 9a47ecd2842a..0a7918d01bf5 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8";
};
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 7f9996d17d99..2eb515d971b8 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv";
};
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5112f8b496f5..7e4fb77b2b34 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,13 +1,8 @@
{ config, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; {
- # Convert a version to branch (3.26.18 → 3.26)
- # Used for finding packages on GNOME mirrors
- versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
-
updateScript = callPackage ./update.nix { };
- version = "3.26";
maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
corePackages = with gnome3; [
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 0e50953b3dea..7dee751314f5 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
};
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index aa0f545c2dbd..b20a85b9e717 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.30.0";
src = fetchurl {
- url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
};
diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 75f9bc48db65..5098ff3bd8bb 100644
--- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
};
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 57070f7ce38a..c23ff2e65159 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074";
};
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index e626d293f83a..d48565716c40 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.9.6";
src = fetchurl {
- url = "mirror://gnome/sources/nemiver/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
};
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index a54c336326ab..7627a45b4d2b 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.22.5";
src = fetchurl {
- url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
};
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 4115fda9f8df..e5dfd279bc75 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c";
};
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index bf21f7346809..110e2e5c4393 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 01e23384b8ea..f7412e022616 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index fc75cd081f9a..0b4d6d770b0d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index b9a4638a947c..29763abba559 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 297e1a9ed7bf..ab978238cf55 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index c871fbbf9160..e36ca2a639d1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.24.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 9a81c88206df..19a6b60fb5bd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.22.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 1d467e542da9..23783c46e2b0 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 855e496dfaf4..85036c70d194 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index f456b7ee6831..fe81b429e999 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-tetravex/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d";
};
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index db01eb86f173..8d4be7f1c6b0 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.4";
src = fetchurl {
- url = "mirror://gnome/sources/hitori/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3";
};
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 55dac4659d0f..4506614b498f 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x";
};
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 73b7c092a66d..dcffe7cea7f4 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
};
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 7ae226b3f8e5..c57ab1a9e14d 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/quadrapassel/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55";
};
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index b7dc6203b8a9..fec448ff47c2 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
};
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index f8d799b69141..e6cdd3c88b72 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/tali/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b";
};
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 045dc2ffc331..94f5f4ef7999 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0088m7p044n741ly1m6i7w25z513h9wpgyw0rmx5f0sy3vyjiic1";
};
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index f8d296122235..7e2709fc1c18 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
};
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index d2dce9d6f1b8..c50db12f6b0f 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
};
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index b1251f5111a4..056aaaa28fcb 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.2.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-autoar/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
};
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index 7bc0ee371752..da50b657007a 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r";
};
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 0ff21a6b0dd8..c2c4c8e94a7d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp";
};
diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
index 38b33ff66671..b65e9c1021e7 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs";
};
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 1b912109cfd5..67f2552b4348 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "4.10.0";
src = fetchurl {
- url = "mirror://gnome/sources/gtkhtml/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
};
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index 069c769efaa2..002310c52762 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -12,7 +12,7 @@ assert postgresSupport -> postgresql != null;
version = "5.2.4";
src = fetchurl {
- url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
};
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 13d34c1c2580..f5f6b799b4b5 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.26.4";
src = fetchurl {
- url = "mirror://gnome/sources/libgit2-glib/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/libgit2-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nhyqas110q7ingw97bvyjdb7v4dzch517dq8sn8c33s8910wqcp";
};
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 9a55864dfcc2..7054e41d7295 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088";
};
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
index 74a4cdca722e..d8a564ac17ea 100644
--- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
};
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index a54384f0bb27..345bd1250254 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -4,13 +4,13 @@ with builtins;
stdenv.mkDerivation rec {
name = "arachne-pnr-${version}";
- version = "2018.05.13";
+ version = "2018.09.08";
src = fetchFromGitHub {
owner = "cseed";
repo = "arachne-pnr";
- rev = "5d830dd94ad956d17d77168fe7718f22f8b55b33";
- sha256 = "1i056m5zn21nml65q9x9mgks4ydl8lqya6a4szix01vn3k0g06vn";
+ rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd";
+ sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index aa1c85ebcb00..0648a245a4c8 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,93 +1,142 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
+, gmp, openssl, readline, tzdata, libxml2, libyaml
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }:
-stdenv.mkDerivation rec {
- name = "crystal-${version}";
- version = "0.26.0";
+let
+ binaryVersion = "0.26.0";
+ releaseDate = "2018-08-29";
- src = fetchurl {
- url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
- sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379";
- };
-
- prebuiltName = "crystal-0.26.0-1";
- prebuiltSrc = let arch = {
- "x86_64-linux" = "linux-x86_64";
- "i686-linux" = "linux-i686";
+ arch = {
+ "x86_64-linux" = "linux-x86_64";
+ "i686-linux" = "linux-i686";
"x86_64-darwin" = "darwin-x86_64";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
- in fetchurl {
- url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz";
- sha256 = {
- "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
- "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
- "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
- }."${stdenv.hostPlatform.system}";
+ }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+ checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ];
+
+ # we could turn this into a function instead in case we cannot use the same
+ # binary to build multiple versions
+ binary = stdenv.mkDerivation rec {
+ name = "crystal-binary-${binaryVersion}";
+
+ src = fetchurl {
+ url = "https://github.com/crystal-lang/crystal/releases/download/${binaryVersion}/crystal-${binaryVersion}-1-${arch}.tar.gz";
+ sha256 = {
+ "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
+ "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
+ "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
+ }."${stdenv.system}";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ tar --strip-components=1 -C $out -xf ${src}
+ '';
};
- unpackPhase = ''
- mkdir ${prebuiltName}
- tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc}
- tar xf ${src}
- '';
+ generic = { version, sha256, doCheck ? true }:
+ stdenv.mkDerivation rec {
+ inherit doCheck;
+ name = "crystal-${version}";
- # crystal on Darwin needs libiconv to build
- libs = [
- boehmgc libatomic_ops pcre libevent
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
- libiconv
- ];
+ src = fetchFromGitHub {
+ owner = "crystal-lang";
+ repo = "crystal";
+ rev = version;
+ inherit sha256;
+ };
- nativeBuildInputs = [ which makeWrapper ];
+ # the first bit can go when https://github.com/crystal-lang/crystal/pull/6788 is merged
+ postPatch = ''
+ substituteInPlace src/compiler/crystal/config.cr \
+ --replace '{{ `date "+%Y-%m-%d"`.stringify.chomp }}' '"${releaseDate}"'
+ ln -s spec/compiler spec/std
+ substituteInPlace spec/std/process_spec.cr \
+ --replace /bin/ /run/current-system/sw/bin
+ '';
- buildInputs = libs ++ [ llvm ];
+ buildInputs = [
+ boehmgc libatomic_ops pcre libevent
+ llvm
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv
+ ];
- libPath = stdenv.lib.makeLibraryPath libs;
+ nativeBuildInputs = [ binary makeWrapper which ];
- sourceRoot = "${name}";
- preBuild = ''
- patchShebangs bin/crystal
- patchShebangs ../${prebuiltName}/bin/crystal
- export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
- '';
+ makeFlags = [
+ "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}"
+ "CRYSTAL_CONFIG_VERSION=${version}"
+ ];
- makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
- "FLAGS=--no-debug"
- "release=1"
- "all" "docs"
- ];
+ buildFlags = [
+ "all" "docs"
+ ];
- installPhase = ''
- install -Dm755 .build/crystal $out/bin/crystal
- wrapProgram $out/bin/crystal \
- --suffix PATH : ${clang}/bin \
- --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
- --suffix LIBRARY_PATH : $libPath
- install -dm755 $out/lib/crystal
- cp -r src/* $out/lib/crystal/
+ FLAGS = [
+ "--release"
+ "--single-module" # needed for deterministic builds
+ ];
- install -dm755 $out/share/doc/crystal/api
- cp -r docs/* $out/share/doc/crystal/api/
- cp -r samples $out/share/doc/crystal/
+ # We *have* to add `which` to the PATH or crystal is unable to build stuff
+ # later if which is not available.
+ installPhase = ''
+ runHook preInstall
- install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
- install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+ install -Dm755 .build/crystal $out/bin/crystal
+ wrapProgram $out/bin/crystal \
+ --suffix PATH : ${lib.makeBinPath [ clang which ]} \
+ --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
+ --suffix LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+ install -dm755 $out/lib/crystal
+ cp -r src/* $out/lib/crystal/
- install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+ install -dm755 $out/share/doc/crystal/api
+ cp -r docs/* $out/share/doc/crystal/api/
+ cp -r samples $out/share/doc/crystal/
- install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
- '';
+ install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+ install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
- dontStrip = true;
+ install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
- enableParallelBuilding = false;
+ install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
- meta = {
- description = "A compiled language with Ruby like syntax and type inference";
- homepage = https://crystal-lang.org/;
- license = stdenv.lib.licenses.asl20;
- maintainers = with stdenv.lib.maintainers; [ manveru david50407 ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ runHook postInstall
+ '';
+
+ enableParallelBuilding = true;
+
+ dontStrip = true;
+
+ checkTarget = "spec";
+
+ preCheck = ''
+ export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
+ '';
+
+ meta = with lib; {
+ description = "A compiled language with Ruby like syntax and type inference";
+ homepage = https://crystal-lang.org/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ manveru david50407 peterhoeg ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ };
};
+
+in rec {
+ crystal_0_25 = generic {
+ version = "0.25.1";
+ sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
+ doCheck = false;
+ };
+
+ crystal_0_26 = generic {
+ version = "0.26.1";
+ sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84";
+ doCheck = false; # about 20 tests out of more than 14000 are failing
+ };
+
+ crystal = crystal_0_26;
}
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 692404a19bf6..e9678ddc4ca1 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -107,26 +107,10 @@ let
/*
- This is not a core Elm package, and it's hosted on GitHub.
- To update, run:
-
- cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
-
- where foo is a tag for a new version, for example "0.8.0".
+ The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
+ `pacakge/nix/build.sh`
*/
- elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix { }) (drv: {
- # https://github.com/avh4/elm-format/issues/529
- patchPhase = ''
- cat >Setup.hs < packages/elm.nix
-cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
-cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
new file mode 100644
index 000000000000..c22683dae03a
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, ncurses5, python27 }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+ name = "gcc-arm-embedded-${version}";
+ version = "7-2018-q2-update";
+ subdir = "7-2018q2";
+
+ urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2";
+
+ src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; };
+
+ phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r * $out
+ '';
+
+ dontPatchELF = true;
+ dontStrip = true;
+
+ preFixup = ''
+ find $out -type f | while read f; do
+ patchelf $f > /dev/null 2>&1 || continue
+ patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+ patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+ done
+ '';
+
+ meta = {
+ description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
+ homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
+ license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+ maintainers = with maintainers; [ prusnak ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 60db368c403a..d9376f597a70 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -201,9 +201,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 361db92cb767..c60f54f1560c 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -210,9 +210,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 14da38b34fb4..47c849d2dcc8 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -216,9 +216,7 @@ stdenv.mkDerivation ({
)
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 2a7af827f2dd..eeb57be97157 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -217,9 +217,7 @@ stdenv.mkDerivation ({
)
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index fd3ce8df497d..59897ccff426 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -190,9 +190,7 @@ stdenv.mkDerivation ({
)
else "");
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -220,9 +218,7 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
- # TODO: Use optionalString with next rebuild.
- ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument";
-
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 427fe3fdddf7..7842110a2146 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -185,9 +185,7 @@ stdenv.mkDerivation ({
)
else "");
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index a3250f4021a5..75e70006d749 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
)
fi
- if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then
+ if test "$crossStageStatic" == 1; then
# We don't want the gcc build to assume there will be a libc providing
# limits.h in this stagae
makeFlagsArray+=(
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 230409e97538..0de6be36c351 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -154,9 +154,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index aac8cf4fd220..b548b05339e4 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -22,7 +22,7 @@
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
- enableShared ? true
+ enableShared ? !stdenv.targetPlatform.useiOSPrebuilt
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
@@ -79,7 +79,7 @@ let
targetCC = builtins.head toolsForTarget;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
version = "8.2.2";
name = "${targetPrefix}ghc-${version}";
@@ -98,6 +98,35 @@ stdenv.mkDerivation rec {
sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f";
})
(import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; })
+ ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform) [
+ # Cherry-pick a few commits from newer hsc2hs so that proper binary is
+ # installed -- stage 2 normally but stage 1 with cross.
+ #
+ # TODO make unconditional next mass rebuild.
+ (fetchpatch {
+ url = "https://git.haskell.org/hsc2hs.git/patch/ecdac062b5cf1d284906487849c56f4e149b3c8e";
+ sha256 = "1gagswi26j50z44sdx0mk1sb3wr0nrqyaph9j724zp6iwqslxyzm";
+ extraPrefix = "utils/hsc2hs/";
+ stripLen = 1;
+ })
+ (fetchpatch {
+ url = "https://git.haskell.org/hsc2hs.git/patch/598303cbffcd230635fbce28ce4105d177fdf76a";
+ sha256 = "0hqcg434qbh1bz1pk85cap2q4v9i8bs6x65yzq4spz6xk3zq6af7";
+ extraPrefix = "utils/hsc2hs/";
+ stripLen = 1;
+ })
+ (fetchpatch {
+ url = "https://git.haskell.org/hsc2hs.git/patch/9483ad10064fbbb97ab525280623826b1ef63959";
+ sha256 = "1cpfdhfc0cz9xkjzkcgwx4fbyj96dkmd04wpwi1vji7fahw8kmf3";
+ extraPrefix = "utils/hsc2hs/";
+ stripLen = 1;
+ })
+ (fetchpatch {
+ url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+ sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+ extraPrefix = "utils/hsc2hs/";
+ stripLen = 1;
+ })
] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch";
@@ -239,4 +268,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 87045815a37f..6546959e0a24 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -32,6 +32,8 @@
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
}:
+assert !enableIntegerSimple -> gmp != null;
+
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -48,8 +50,7 @@ let
include mk/flavours/\$(BuildFlavour).mk
endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- '' + stdenv.lib.optionalString enableIntegerSimple ''
- INTEGER_LIBRARY = integer-simple
+ INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
CrossCompilePrefix = ${targetPrefix}
@@ -77,7 +78,7 @@ let
targetCC = builtins.head toolsForTarget;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
inherit version;
inherit (src) rev;
name = "${targetPrefix}ghc-${version}";
@@ -206,4 +207,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 718628d8ad41..7b88efd1e616 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
- version = "1.2.70";
+ version = "1.2.71";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2";
+ sha256 = "0yzanv2jkjx3vfixzvjsihfi00khs7zr47y01cil8bylzvyr50p4";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index c7b4615e374a..b182f1250e72 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
- # on next rebuild, this can be replaced with optionals; for now set to null to avoid
- # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- patches = if stdenv.hostPlatform.isMusl then [
+ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
- ] else null;
+ ];
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 3abba0ed340f..6dae8be97c88 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -119,12 +119,14 @@ in stdenv.mkDerivation (rec {
+ stdenv.lib.optionalString enableSharedLibraries ''
moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+ moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
''
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
- --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
'';
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 1f87cb83ab01..3a165e9da7b1 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
- # on next rebuild, this can be replaced with optionals; for now set to null to avoid
- # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- patches = if stdenv.hostPlatform.isMusl then [
+ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
- ] else null;
+ ];
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 2896c0c09139..de7e3bd6a07e 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
# Updating the dependencies for this package:
#
-# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock
+# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock
# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr'
#
-{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
let
crystalPackages = lib.mapAttrs (name: src:
stdenv.mkDerivation {
@@ -33,17 +33,16 @@ let
};
in
stdenv.mkDerivation rec {
- version = "0.2.1";
+ version = "0.3.1";
name = "mint-${version}";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = version;
- sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1";
+ sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr";
};
- nativeBuildInputs = [ which ];
- buildInputs = [ crystal zlib openssl duktape ];
+ nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];
buildPhase = ''
mkdir -p $out/bin tmp
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index 069df52ba12d..fbf85ef80426 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,8 +8,8 @@
ameba = {
owner = "veelenga";
repo = "ameba";
- rev = "v0.7.0";
- sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
+ rev = "v0.8.0";
+ sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka";
};
baked_file_system = {
owner = "schovi";
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 901675ff31b4..55348c5795ad 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.26.2";
+ version = "1.28.0";
# fetch hashes by running `print-hashes.sh 1.24.1`
hashes = {
- i686-unknown-linux-gnu = "e22286190a074bfb6d47c9fde236d712a53675af1563ba85ea33e0d40165f755";
- x86_64-unknown-linux-gnu = "d2b4fb0c544874a73c463993bde122f031c34897bb1eeb653d2ba2b336db83e6";
- armv7-unknown-linux-gnueabihf = "1140387a61083e3ef10e7a097269200fc7e9db6f6cc9f270e04319b3b429c655";
- aarch64-unknown-linux-gnu = "3dfad0dc9c795f7ee54c2099c9b7edf06b942adbbf02e9ed9e5d4b5e3f1f3759";
- i686-apple-darwin = "3a5de30f3e334a66bd320ec0e954961d348434da39a826284e00d55ea60f8370";
- x86_64-apple-darwin = "f193705d4c0572a358670dbacbf0ffadcd04b3989728b442f4680fa1e065fa72";
+ i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f";
+ x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810";
+ armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2";
+ aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1";
+ i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68";
+ x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393";
};
platform =
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 34932c911ebc..25a71965e0b4 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -28,6 +28,9 @@ rustPlatform.buildRustPackage rec {
LIBGIT2_SYS_USE_PKG_CONFIG=1;
+ # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
+ RUSTC_BOOTSTRAP=1;
+
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# CFURLSetResourcePropertyForKey is defined in the headers but there's no
# corresponding implementation in the sources from opensource.apple.com.
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index d368c977f8f8..47415ac9177b 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
- version = "1.27.0";
- cargoVersion = "1.27.0";
+ version = "1.29.0";
+ cargoVersion = "1.29.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c";
+ sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
};
in rec {
rustc = callPackage ./rustc.nix {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 9c9788ff4834..a054ed0eb557 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -105,6 +105,11 @@ stdenv.mkDerivation {
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
+ # https://github.com/rust-lang/rust/issues/39522
+ echo removing gdb-version-sensitive tests...
+ find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
+ rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
+
# Useful debugging parameter
# export VERBOSE=1
'' + optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 8a20066becb7..2d6c060e89e0 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
stdenv.mkDerivation rec {
- name = "scala-2.12.6";
+ name = "scala-2.12.7";
src = fetchurl {
url = "https://www.scala-lang.org/files/archive/${name}.tgz";
- sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
+ sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index a4a8aa980b62..fb2d9fc535af 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -45,20 +45,20 @@ let
in rec {
vala_0_34 = generic {
major = "0.34";
- minor = "17";
- sha256 = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2";
+ minor = "18";
+ sha256 = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
};
vala_0_36 = generic {
major = "0.36";
- minor = "13";
- sha256 = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k";
+ minor = "15";
+ sha256 = "11lnwjbhiz2l7g6y1f0jb0s81ymgssinlil3alibzcwmzpk175ix";
};
vala_0_38 = generic {
major = "0.38";
- minor = "9";
- sha256 = "1dh1qacfsc1nr6hxwhn9lqmhnq39rv8gxbapdmj1v65zs96j3fn3";
+ minor = "10";
+ sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
};
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 532fc04a447f..314fbf354e19 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2018.08.08";
+ version = "2018.09.30";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "93efbd5d158e374a0abe2afb06484ccc14aa2c88";
- sha256 = "13y7rzpykihal789hyibg629gwj5bh1s0782y5xxj6jlg0bc9ly8";
+ rev = "4d2917447cc14c590b4fee5ba36948fb4ee6884b";
+ sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1";
name = "yosys";
})
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index 9d9a4cb5f1a1..cbfd79fdd272 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -19,6 +19,12 @@ let params =
rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
};
+
+ "8.8" = {
+ version = "20171215";
+ rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+ sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+ };
};
param = params."${coq.coq-version}";
in
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40bd4a7f0c9a..409f159387fd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -953,13 +953,6 @@ self: super: {
# https://github.com/yesodweb/Shelly.hs/issues/162
shelly = dontCheck super.shelly;
- # https://github.com/simonmichael/hledger/issues/852
- hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
- url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
- sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
- stripLen = 1;
- });
-
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@@ -1159,4 +1152,5 @@ self: super: {
sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq";
});
+ xmonad-extras = doJailbreak super.xmonad-extras;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 dbe3bafc41b3..041227059cde 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -45,23 +45,24 @@ self: super: {
hoopl = self.hoopl_3_10_2_2;
# LTS-12.x versions do not compile.
+ base-orphans = self.base-orphans_0_8;
contravariant = self.contravariant_1_5;
control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
- doctest = self.doctest_0_16_0_1;
- doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
+ free = self.free_5_1;
Glob = self.Glob_0_9_3;
haddock-library = markBroken super.haddock-library;
hslogger = self.hslogger_1_2_12;
- hspec = self.hspec_2_5_7;
- hspec-core = self.hspec-core_2_5_7;
- hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
- hspec-discover = self.hspec-discover_2_5_7;
+ hspec = self.hspec_2_5_8;
+ hspec-core = self.hspec-core_2_5_8;
+ hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
+ hspec-discover = self.hspec-discover_2_5_8;
hspec-meta = self.hspec-meta_2_5_6;
- hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+ hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
JuicyPixels = self.JuicyPixels_3_3_1;
- lens = dontCheck super.lens; # avoid depending on broken polyparse
+ lens = self.lens_4_17;
polyparse = markBrokenVersion "1.12" super.polyparse;
primitive = self.primitive_0_6_4_0;
+ semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6;
unordered-containers = dontCheck super.unordered-containers;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5d7173bf44a4..aee9b8df8fa3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,9 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
- # LTS Haskell 12.10
+ # Newer versions don't work in LTS-12.x
+ - cassava-megaparsec < 2
+ # LTS Haskell 12.11
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -60,7 +62,7 @@ default-package-overrides:
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5
- - aeson-compat ==0.3.8
+ - aeson-compat ==0.3.9
- aeson-diff ==1.1.0.5
- aeson-extra ==0.4.1.1
- aeson-generic-compat ==0.0.1.3
@@ -76,7 +78,7 @@ default-package-overrides:
- alarmclock ==0.5.0.2
- alerts ==0.1.0.0
- alex ==3.2.4
- - alg ==0.2.6.0
+ - alg ==0.2.7.0
- algebra ==4.3.1
- Allure ==0.8.3.0
- almost-fix ==0.0.2
@@ -210,7 +212,7 @@ default-package-overrides:
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
- attoparsec-ip ==0.0.1
- - attoparsec-iso8601 ==1.0.0.0
+ - attoparsec-iso8601 ==1.0.1.0
- attoparsec-path ==0.0.0.1
- attoparsec-uri ==0.0.4
- audacity ==0.0.2
@@ -259,7 +261,7 @@ default-package-overrides:
- binary-parsers ==0.2.3.0
- binary-search ==1.0.0.3
- binary-shared ==0.8.3
- - binary-tagged ==0.1.5
+ - binary-tagged ==0.1.5.1
- bindings-DSL ==1.0.25
- bindings-GLFW ==3.2.1.1
- bindings-libzip ==1.0.1
@@ -286,7 +288,7 @@ default-package-overrides:
- blaze-builder ==0.4.1.0
- blaze-colonnade ==1.2.2
- blaze-html ==0.9.1.1
- - blaze-markup ==0.8.2.1
+ - blaze-markup ==0.8.2.2
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
@@ -306,7 +308,7 @@ default-package-overrides:
- brick ==0.37.2
- brittany ==0.11.0.0
- broadcast-chan ==0.1.1
- - bsb-http-chunked ==0.0.0.3
+ - bsb-http-chunked ==0.0.0.4
- bson ==0.3.2.6
- bson-lens ==0.1.1
- btrfs ==0.1.2.3
@@ -315,27 +317,27 @@ default-package-overrides:
- butcher ==1.3.1.1
- butter ==0.1.0.6
- bv ==0.5
- - bv-little ==0.1.1
+ - bv-little ==0.1.2
- byteable ==0.1.1
- bytedump ==1.0
- byteorder ==1.0.4
- bytes ==0.15.5
- byteset ==0.1.1.0
- - bytestring-builder ==0.10.8.1.0
+ - bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
- bytestring-lexing ==0.5.0.2
- bytestring-strict-builder ==0.4.5.1
- bytestring-tree-builder ==0.2.7.2
- bzlib ==0.5.0.5
- bzlib-conduit ==0.3.0.1
- - c2hs ==0.28.5
+ - c2hs ==0.28.6
- Cabal ==2.2.0.1
- cabal2spec ==2.1.1
- cabal-doctest ==1.0.6
- cabal-rpm ==0.12.5
- cache ==0.1.1.1
- - cachix ==0.1.1
- - cachix-api ==0.1.0.1
+ - cachix ==0.1.2
+ - cachix-api ==0.1.0.2
- cairo ==0.13.5.0
- calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
@@ -364,7 +366,7 @@ default-package-overrides:
- charsetdetect-ae ==1.1.0.4
- chart-unit ==0.7.0.0
- chaselev-deque ==0.5.0.5
- - ChasingBottoms ==1.3.1.4
+ - ChasingBottoms ==1.3.1.5
- chatwork ==0.1.3.5
- cheapskate ==0.1.1
- cheapskate-highlight ==0.1.0.0
@@ -430,14 +432,14 @@ default-package-overrides:
- composition-prelude ==1.5.3.1
- compressed ==3.11
- concise ==0.1.0.1
- - concurrency ==1.6.0.0
+ - concurrency ==1.6.1.0
- concurrent-extra ==0.7.0.12
- - concurrent-output ==1.10.6
+ - concurrent-output ==1.10.7
- concurrent-split ==0.0.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.3.0.3
- - conduit-algorithms ==0.0.8.1
+ - conduit-algorithms ==0.0.8.2
- conduit-combinators ==1.3.0
- conduit-connection ==0.1.0.4
- conduit-extra ==1.3.0
@@ -482,7 +484,7 @@ default-package-overrides:
- crypto-cipher-tests ==0.0.11
- crypto-cipher-types ==0.0.9
- cryptocompare ==0.1.1
- - crypto-enigma ==0.0.2.12
+ - crypto-enigma ==0.0.2.13
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
@@ -543,7 +545,7 @@ default-package-overrides:
- data-msgpack-types ==0.0.2
- data-or ==1.0.0.5
- data-ordlist ==0.4.7.0
- - data-ref ==0.0.1.1
+ - data-ref ==0.0.1.2
- data-reify ==0.6.1
- data-serializer ==0.3.4
- datasets ==0.2.5
@@ -565,7 +567,7 @@ default-package-overrides:
- dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6
- deque ==0.2.1
- - deriving-compat ==0.5.1
+ - deriving-compat ==0.5.2
- derulo ==1.0.3
- detour-via-sci ==1.0.0
- df1 ==0.1.1
@@ -601,10 +603,10 @@ default-package-overrides:
- discount ==0.1.1
- discrimination ==0.3
- disk-free-space ==0.1.0.1
- - distributed-closure ==0.4.0
+ - distributed-closure ==0.4.1
- distributed-static ==0.3.8
- distributive ==0.5.3
- - dlist ==0.8.0.4
+ - dlist ==0.8.0.5
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==3.0.4
@@ -612,7 +614,7 @@ default-package-overrides:
- dockerfile ==0.1.0.1
- docopt ==0.7.0.5
- doctemplates ==0.2.2.1
- - doctest ==0.16.0
+ - doctest ==0.16.0.1
- doctest-discover ==0.1.0.9
- doctest-driver-gen ==0.2.0.3
- do-list ==1.0.1
@@ -657,7 +659,7 @@ default-package-overrides:
- elm-export ==0.6.0.1
- email-validate ==2.3.2.7
- enclosed-exceptions ==1.0.3
- - entropy ==0.4.1.1
+ - entropy ==0.4.1.3
- enummapset ==0.5.2.2
- enumset ==0.0.4.1
- enum-subset-generate ==0.1.0.0
@@ -666,7 +668,7 @@ default-package-overrides:
- epub-metadata ==4.5
- eq ==4.2
- equal-files ==0.0.5.3
- - equivalence ==0.3.2
+ - equivalence ==0.3.3
- erf ==2.0.0.0
- errors ==2.3.0
- errors-ext ==0.4.2
@@ -698,7 +700,7 @@ default-package-overrides:
- exp-pairs ==0.1.6.0
- extensible ==0.4.9
- extensible-exceptions ==0.1.1.4
- - extra ==1.6.9
+ - extra ==1.6.12
- extractable-singleton ==0.0.1
- extrapolate ==0.3.3
- facts ==0.0.1.0
@@ -728,7 +730,7 @@ default-package-overrides:
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
- fin ==0.0.1
- - Fin ==0.2.5.0
+ - Fin ==0.2.6.0
- FindBin ==0.0.5
- find-clumpiness ==0.2.3.1
- fingertree ==0.1.4.1
@@ -749,8 +751,8 @@ default-package-overrides:
- fn ==0.3.0.2
- focus ==0.1.5.2
- foldable1 ==0.1.0.0
- - fold-debounce ==0.2.0.7
- - fold-debounce-conduit ==0.2.0.1
+ - fold-debounce ==0.2.0.8
+ - fold-debounce-conduit ==0.2.0.2
- foldl ==1.4.4
- folds ==0.7.4
- FontyFruity ==0.5.3.3
@@ -823,7 +825,7 @@ default-package-overrides:
- ghcjs-codemirror ==0.0.0.2
- ghc-parser ==0.2.0.2
- ghc-paths ==0.1.0.9
- - ghc-prof ==1.4.1.3
+ - ghc-prof ==1.4.1.4
- ghc-syntax-highlighter ==0.0.2.0
- ghc-tcplugins-extra ==0.3
- ghc-typelits-extra ==0.2.6
@@ -837,8 +839,8 @@ default-package-overrides:
- gi-gio ==2.0.18
- gi-glib ==2.0.17
- gi-gobject ==2.0.16
- - gi-gtk ==3.0.24
- - gi-gtk-hs ==0.3.6.1
+ - gi-gtk ==3.0.25
+ - gi-gtk-hs ==0.3.6.2
- gi-gtksource ==3.0.16
- gi-javascriptcore ==4.0.15
- gio ==0.13.5.0
@@ -856,7 +858,7 @@ default-package-overrides:
- glazier ==1.0.0.0
- GLFW-b ==3.2.1.0
- glib ==0.13.6.0
- - Glob ==0.9.2
+ - Glob ==0.9.3
- gloss ==1.12.0.0
- gloss-raster ==1.12.0.0
- gloss-rendering ==1.12.0.0
@@ -874,7 +876,7 @@ default-package-overrides:
- graylog ==0.1.0.1
- greskell ==0.2.1.0
- greskell-core ==0.1.2.3
- - greskell-websocket ==0.1.1.0
+ - greskell-websocket ==0.1.1.1
- groom ==0.1.2.1
- groups ==0.4.1.0
- gtk ==0.14.10
@@ -886,13 +888,13 @@ default-package-overrides:
- hackage-security ==0.5.3.0
- haddock-library ==1.5.0.1
- hailgun ==0.4.1.8
- - hakyll ==4.12.3.0
+ - hakyll ==4.12.4.0
- half ==0.3
- hamilton ==0.1.0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- - hapistrano ==0.3.5.10
+ - hapistrano ==0.3.6.0
- happstack-server ==7.5.1.1
- happy ==1.19.9
- hasbolt ==0.1.3.0
@@ -903,16 +905,16 @@ default-package-overrides:
- hashtables ==1.2.3.1
- haskeline ==0.7.4.3
- haskell-gi ==0.21.4
- - haskell-gi-base ==0.21.1
+ - haskell-gi-base ==0.21.3
- haskell-gi-overloading ==1.0
- - haskell-lexer ==1.0.1
+ - haskell-lexer ==1.0.2
- haskell-lsp ==0.2.2.0
- haskell-lsp-types ==0.2.2.0
- HaskellNet ==0.5.1
- HaskellNet-SSL ==0.3.4.0
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
- - haskell-src-exts ==1.20.2
+ - haskell-src-exts ==1.20.3
- haskell-src-exts-simple ==1.20.0.0
- haskell-src-exts-util ==0.2.3
- haskell-src-meta ==0.8.0.3
@@ -934,7 +936,7 @@ default-package-overrides:
- hasql-transaction ==0.7
- hasty-hamiltonian ==1.3.2
- HaTeX ==3.19.0.0
- - haxl ==2.0.1.0
+ - haxl ==2.0.1.1
- hbeanstalk ==0.2.4
- HCodecs ==0.5.1
- hdaemonize ==0.5.5
@@ -944,7 +946,7 @@ default-package-overrides:
- heap ==1.0.4
- heaps ==0.3.6
- hebrew-time ==0.1.1
- - hedgehog ==0.6
+ - hedgehog ==0.6.1
- hedgehog-corpus ==0.1.0
- hedis ==0.10.4
- here ==1.2.13
@@ -993,7 +995,7 @@ default-package-overrides:
- hquantlib ==0.0.4.0
- hreader ==1.1.0
- hreader-lens ==0.1.3.0
- - hruby ==0.3.5.4
+ - hruby ==0.3.6
- hsass ==0.7.0
- hs-bibutils ==6.6.0.0
- hscolour ==1.24.4
@@ -1008,7 +1010,7 @@ default-package-overrides:
- hsini ==0.5.1.2
- hsinstall ==1.6
- HSlippyMap ==3.0.1
- - hslogger ==1.2.10
+ - hslogger ==1.2.12
- hslua ==0.9.5.2
- hslua-aeson ==0.3.0.2
- hslua-module-text ==0.1.2.1
@@ -1059,7 +1061,7 @@ default-package-overrides:
- http-media ==0.7.1.2
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.6.1
- - http-types ==0.12.1
+ - http-types ==0.12.2
- human-readable-duration ==0.2.0.3
- HUnit ==1.6.0.0
- HUnit-approx ==1.1.1.1
@@ -1081,7 +1083,7 @@ default-package-overrides:
- hw-mquery ==0.1.0.1
- hworker ==0.1.0.1
- hw-parser ==0.0.0.3
- - hw-prim ==0.6.2.15
+ - hw-prim ==0.6.2.17
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.3.2.1
- hw-string-parse ==0.0.0.4
@@ -1155,7 +1157,7 @@ default-package-overrides:
- IPv6DB ==0.3.1
- ipython-kernel ==0.9.1.0
- irc ==0.6.1.0
- - irc-client ==1.1.0.4
+ - irc-client ==1.1.0.5
- irc-conduit ==0.3.0.1
- irc-ctcp ==0.1.3.0
- irc-dcc ==2.0.1
@@ -1206,7 +1208,7 @@ default-package-overrides:
- lackey ==1.0.5
- LambdaHack ==0.8.3.0
- lame ==0.1.1
- - language-c ==0.8.1
+ - language-c ==0.8.2
- language-c-quote ==0.12.2
- language-docker ==6.0.4
- language-ecmascript ==0.19
@@ -1224,15 +1226,15 @@ default-package-overrides:
- lawful ==0.1.0.0
- lazyio ==0.1.0.4
- lca ==0.3.1
- - leancheck ==0.7.4
+ - leancheck ==0.7.5
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.3
- lens ==4.16.1
- lens-action ==0.2.3
- lens-aeson ==1.0.2
- lens-datetime ==0.3
- - lens-family ==1.2.2
- - lens-family-core ==1.2.2
+ - lens-family ==1.2.3
+ - lens-family-core ==1.2.3
- lens-family-th ==0.5.0.2
- lens-labels ==0.2.0.2
- lens-misc ==0.0.2.0
@@ -1247,7 +1249,7 @@ default-package-overrides:
- libmpd ==0.9.0.8
- libxml-sax ==0.7.5
- LibZip ==1.0.1
- - lifted-async ==0.10.0.2
+ - lifted-async ==0.10.0.3
- lifted-base ==0.2.3.12
- lift-generics ==0.1.2
- line ==4.0.1
@@ -1295,11 +1297,11 @@ default-package-overrides:
- makefile ==1.1.0.0
- managed ==1.0.6
- mapquest-api ==0.3.1
- - markdown ==0.1.17.1
+ - markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- marvin-interpolate ==1.1.2
- - massiv ==0.2.0.0
+ - massiv ==0.2.1.0
- massiv-io ==0.1.4.0
- mathexpr ==0.3.0.0
- math-functions ==0.2.1.0
@@ -1331,7 +1333,7 @@ default-package-overrides:
- microlens-ghc ==0.4.9.1
- microlens-mtl ==0.1.11.1
- microlens-platform ==0.3.10
- - microlens-th ==0.4.2.2
+ - microlens-th ==0.4.2.3
- microspec ==0.1.0.0
- microstache ==1.0.1.1
- midi ==0.2.2.2
@@ -1444,8 +1446,8 @@ default-package-overrides:
- network-ip ==0.3.0.2
- network-multicast ==0.2.0
- Network-NineP ==0.4.3
- - network-simple ==0.4.2
- - network-simple-tls ==0.3
+ - network-simple ==0.4.3
+ - network-simple-tls ==0.3.1
- network-transport ==0.5.2
- network-transport-composed ==0.2.1
- network-transport-inmemory ==0.5.2
@@ -1480,7 +1482,7 @@ default-package-overrides:
- objective ==1.1.2
- ObjectName ==1.1.0.1
- o-clock ==1.0.0
- - odbc ==0.2.0
+ - odbc ==0.2.2
- oeis ==0.3.9
- ofx ==0.4.2.0
- old-locale ==1.0.0.7
@@ -1518,7 +1520,7 @@ default-package-overrides:
- pagination ==0.2.1
- palette ==0.3.0.1
- pandoc ==2.2.1
- - pandoc-citeproc ==0.14.3.1
+ - pandoc-citeproc ==0.14.5
- pandoc-types ==1.17.5.1
- pango ==0.13.5.0
- papillon ==0.1.0.6
@@ -1573,7 +1575,7 @@ default-package-overrides:
- pipes-binary ==0.4.2
- pipes-bytestring ==2.1.6
- pipes-category ==0.3.0.0
- - pipes-concurrency ==2.0.11
+ - pipes-concurrency ==2.0.12
- pipes-csv ==1.4.3
- pipes-extras ==1.0.15
- pipes-fastx ==0.3.0.0
@@ -1601,7 +1603,7 @@ default-package-overrides:
- pooled-io ==0.0.2.2
- portable-lines ==0.1
- postgresql-binary ==0.12.1.1
- - postgresql-libpq ==0.9.4.1
+ - postgresql-libpq ==0.9.4.2
- postgresql-schema ==0.1.14
- postgresql-simple ==0.5.4.0
- postgresql-simple-migration ==0.1.12.0
@@ -1611,7 +1613,7 @@ default-package-overrides:
- postgresql-typed ==0.5.3.0
- post-mess-age ==0.2.1.0
- pptable ==0.3.0.0
- - pqueue ==1.4.1.1
+ - pqueue ==1.4.1.2
- prefix-units ==0.2.0
- prelude-compat ==0.0.0.1
- prelude-extras ==0.4.0.3
@@ -1811,7 +1813,7 @@ default-package-overrides:
- servant-auth ==0.3.2.0
- servant-auth-client ==0.3.3.0
- servant-auth-docs ==0.2.10.0
- - servant-auth-server ==0.4.0.0
+ - servant-auth-server ==0.4.0.1
- servant-auth-swagger ==0.2.10.0
- servant-blaze ==0.8
- servant-cassava ==0.10
@@ -1854,7 +1856,7 @@ default-package-overrides:
- SHA ==1.6.4.4
- shake ==0.16.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.15
+ - shakespeare ==2.0.18
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
- shelltestrunner ==1.9
@@ -1872,7 +1874,7 @@ default-package-overrides:
- simple-vec3 ==0.4.0.8
- since ==0.0.0
- singleton-bool ==0.1.4
- - singleton-nats ==0.4.1
+ - singleton-nats ==0.4.2
- singletons ==2.4.1
- siphash ==1.0.3
- size-based ==0.1.1.0
@@ -1931,12 +1933,12 @@ default-package-overrides:
- step-function ==0.2
- stm ==2.4.5.1
- stm-chans ==3.0.0.4
- - stm-conduit ==4.0.0
+ - stm-conduit ==4.0.1
- stm-containers ==0.2.16
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- STMonadTrans ==0.4.3
- - stm-split ==0.0.2
+ - stm-split ==0.0.2.1
- stm-stats ==0.2.0.0
- stopwatch ==0.1.0.5
- storable-complex ==0.2.2
@@ -1994,7 +1996,7 @@ default-package-overrides:
- tagged-identity ==0.1.2
- tagged-transformer ==0.8.1
- tagshare ==0.0
- - tagsoup ==0.14.6
+ - tagsoup ==0.14.7
- tagstream-conduit ==0.5.5.3
- tao ==1.0.0
- tao-example ==1.0.0
@@ -2013,7 +2015,7 @@ default-package-overrides:
- tasty-kat ==0.0.3
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10
- - tasty-silver ==3.1.11
+ - tasty-silver ==3.1.12
- tasty-smallcheck ==0.8.1
- tasty-stats ==0.2.0.4
- tasty-th ==0.1.7
@@ -2035,8 +2037,8 @@ default-package-overrides:
- test-framework-th ==0.2.4
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- - texmath ==0.11.1
- - text ==1.2.3.0
+ - texmath ==0.11.1.1
+ - text ==1.2.3.1
- text-binary ==0.2.1.1
- text-builder ==0.5.4.3
- text-conversions ==0.3.0
@@ -2057,7 +2059,7 @@ default-package-overrides:
- th-abstraction ==0.2.8.0
- th-data-compat ==0.0.2.7
- th-desugar ==1.8
- - these ==0.7.4
+ - these ==0.7.5
- th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4
- th-lift ==0.7.11
@@ -2117,7 +2119,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- - turtle ==1.5.10
+ - turtle ==1.5.11
- TypeCompose ==0.9.13
- typed-process ==0.2.3.0
- type-fun ==0.1.1
@@ -2133,10 +2135,10 @@ default-package-overrides:
- type-spec ==0.3.0.1
- typography-geometry ==1.0.0.1
- tz ==0.1.3.1
- - tzdata ==0.1.20180122.0
+ - tzdata ==0.1.20180501.0
- uglymemo ==0.1.0.1
- unbounded-delays ==0.1.1.0
- - unbound-generics ==0.3.3
+ - unbound-generics ==0.3.4
- unboxed-ref ==0.4.0.0
- uncertain ==0.3.1.0
- unconstrained ==0.1.0.2
@@ -2163,7 +2165,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.1
- unix-time ==0.3.8
- - unliftio ==0.2.8.0
+ - unliftio ==0.2.8.1
- unliftio-core ==0.1.2.0
- unlit ==0.4.0.0
- unordered-containers ==0.2.9.0
@@ -2226,7 +2228,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.4
- wai-cors ==0.2.6
- wai-eventsource ==3.0.0
- - wai-extra ==3.0.24.2
+ - wai-extra ==3.0.24.3
- wai-handler-launch ==3.0.2.4
- wai-logger ==2.3.2
- wai-middleware-caching ==0.1.0.2
@@ -2257,13 +2259,13 @@ default-package-overrides:
- web-routes-hsp ==0.24.6.1
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- - websockets ==0.12.5.1
+ - websockets ==0.12.5.2
- websockets-snap ==0.10.3.0
- weigh ==0.0.12
- wide-word ==0.1.0.6
- wikicfp-scraper ==0.1.0.9
- - wild-bind ==0.1.2.1
- - wild-bind-x11 ==0.2.0.4
+ - wild-bind ==0.1.2.2
+ - wild-bind-x11 ==0.2.0.5
- Win32-notify ==0.3.0.3
- wire-streams ==0.1.1.0
- withdependencies ==0.2.4.2
@@ -2294,7 +2296,7 @@ default-package-overrides:
- X11 ==1.9
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
- - x509 ==1.7.3
+ - x509 ==1.7.4
- x509-store ==1.6.6
- x509-system ==1.6.6
- x509-validation ==1.6.10
@@ -2309,7 +2311,7 @@ default-package-overrides:
- xml-basic ==0.1.3.1
- xmlbf ==0.4.1
- xmlbf-xeno ==0.1.1
- - xml-conduit ==1.8.0
+ - xml-conduit ==1.8.0.1
- xml-conduit-parse ==0.3.1.2
- xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.2
@@ -2343,7 +2345,7 @@ default-package-overrides:
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.0.0
- yesod-newsfeed ==1.6.1.0
- - yesod-paginator ==1.1.0.0
+ - yesod-paginator ==1.1.0.1
- yesod-persistent ==1.6.0
- yesod-recaptcha2 ==0.2.4
- yesod-sitemap ==1.6.0
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 43ba2d000eb5..bb9b0e5d5fe6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -131,8 +131,16 @@ self: super: builtins.intersectAttrs super {
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+ # darwin.security_tool is broken in Mojave (#45042)
+
+ # We will use the system provided security for now.
+ # Beware this WILL break in sandboxes!
+
+ # TODO(matthewbauer): If someone really needs this to work in sandboxes,
+ # I think we can add a propagatedImpureHost dep here, but I’m hoping to
+ # get a proper fix available soonish.
postPatch = (drv.postPatch or "") + ''
- substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+ substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
'';
})
else super.x509-system;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 648ee4b6b9b6..a3426f4e249d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages, buildHaskellPackages, ghc
-, jailbreak-cabal, hscolour, cpphs, nodejs
+, jailbreak-cabal, hscolour, cpphs, nodejs, shellFor
}:
let
@@ -174,8 +174,7 @@ let
(optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
];
- isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
- isSystemPkg = x: !isHaskellPkg x;
+ isHaskellPkg = x: x ? isHaskellLibrary;
allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
@@ -192,20 +191,15 @@ let
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
- allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
- haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
- systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
-
- # When not cross compiling, also include Setup.hs dependencies.
- ghcEnv = ghc.withPackages (p:
- haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
+ allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild;
+ isHaskellPartition =
+ stdenv.lib.partition isHaskellPkg allBuildInputs;
setupCommand = "./Setup";
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
- ghcCommandCaps= toUpper ghcCommand';
nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
@@ -215,8 +209,7 @@ let
continue
fi
'';
-
-in
+in stdenv.lib.fix (drv:
assert allPkgconfigDepends != [] -> pkgconfig != null;
@@ -429,6 +422,13 @@ stdenv.mkDerivation ({
compiler = ghc;
+
+ getBuildInputs = {
+ inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
+ haskellBuildInputs = isHaskellPartition.right;
+ systemBuildInputs = isHaskellPartition.wrong;
+ };
+
isHaskellLibrary = isLibrary;
# TODO: ask why the split outputs are configurable at all?
@@ -439,23 +439,10 @@ stdenv.mkDerivation ({
# TODO: fetch the self from the fixpoint instead
haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
- env = stdenv.mkDerivation {
- name = "interactive-${pname}-${version}-environment";
- buildInputs = systemBuildInputs;
- nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
- LANG = "en_US.UTF-8";
- LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
- shellHook = ''
- export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
- export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
- # TODO: is this still valid?
- export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
- ${if isHaLVM
- then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''
- else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''}
- ${shellHook}
- '';
+ env = shellFor {
+ packages = p: [ drv ];
};
+
};
meta = { inherit homepage license platforms; }
@@ -489,3 +476,4 @@ stdenv.mkDerivation ({
// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
// optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
)
+)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93e36fa78890..b160174cf5eb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -139,6 +139,8 @@ self: {
pname = "AC-HalfInteger";
version = "1.2.1";
sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
+ revision = "1";
+ editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9";
libraryHaskellDepends = [ base ];
description = "Efficient half-integer type";
license = stdenv.lib.licenses.bsd3;
@@ -151,6 +153,8 @@ self: {
pname = "AC-MiniTest";
version = "1.1.1";
sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
+ revision = "1";
+ editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y";
libraryHaskellDepends = [ base transformers ];
description = "A simple test framework";
license = stdenv.lib.licenses.bsd3;
@@ -185,6 +189,8 @@ self: {
pname = "AC-Terminal";
version = "1.0";
sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
+ revision = "1";
+ editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm";
libraryHaskellDepends = [ ansi-terminal base ];
description = "Trivial wrapper over ansi-terminal";
license = stdenv.lib.licenses.bsd3;
@@ -209,6 +215,8 @@ self: {
pname = "AC-Vector";
version = "2.3.2";
sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
+ revision = "1";
+ editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0";
libraryHaskellDepends = [ base ];
description = "Efficient geometric vectors and transformations";
license = stdenv.lib.licenses.bsd3;
@@ -2753,24 +2761,6 @@ self: {
}) {};
"ChasingBottoms" = callPackage
- ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
- , syb
- }:
- mkDerivation {
- pname = "ChasingBottoms";
- version = "1.3.1.4";
- sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
- libraryHaskellDepends = [
- base containers mtl QuickCheck random syb
- ];
- testHaskellDepends = [
- array base containers mtl QuickCheck random syb
- ];
- description = "For testing partial and infinite values";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ChasingBottoms_1_3_1_5" = callPackage
({ mkDerivation, array, base, containers, mtl, QuickCheck, random
, syb
}:
@@ -2786,7 +2776,6 @@ self: {
];
description = "For testing partial and infinite values";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"CheatSheet" = callPackage
@@ -5437,19 +5426,6 @@ self: {
}) {};
"Fin" = callPackage
- ({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
- mkDerivation {
- pname = "Fin";
- version = "0.2.5.0";
- sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc";
- libraryHaskellDepends = [
- alg base foldable1 natural-induction peano
- ];
- description = "Finite totally-ordered sets";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Fin_0_2_6_0" = callPackage
({ mkDerivation, alg, base, foldable1, natural-induction, peano
, universe-base
}:
@@ -5462,7 +5438,6 @@ self: {
];
description = "Finite totally-ordered sets";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Finance-Quote-Yahoo" = callPackage
@@ -5615,6 +5590,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "FontyFruity_0_5_3_4" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, deepseq
+ , directory, filepath, text, vector, xml
+ }:
+ mkDerivation {
+ pname = "FontyFruity";
+ version = "0.5.3.4";
+ sha256 = "0gavpjv83vg5q2x254d3zi3kw5aprl6z8ifcn0vs6hymaj0qgls3";
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq directory filepath text
+ vector xml
+ ];
+ description = "A true type file format loader";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ForSyDe" = callPackage
({ mkDerivation, array, base, containers, directory, filepath, mtl
, old-time, parameterized-data, pretty, process, random
@@ -6594,28 +6586,6 @@ self: {
}) {};
"Glob" = callPackage
- ({ mkDerivation, base, containers, directory, dlist, filepath
- , HUnit, QuickCheck, test-framework, test-framework-hunit
- , test-framework-quickcheck2, transformers, transformers-compat
- }:
- mkDerivation {
- pname = "Glob";
- version = "0.9.2";
- sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
- libraryHaskellDepends = [
- base containers directory dlist filepath transformers
- transformers-compat
- ];
- testHaskellDepends = [
- base containers directory dlist filepath HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- transformers transformers-compat
- ];
- description = "Globbing library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Glob_0_9_3" = callPackage
({ mkDerivation, base, containers, directory, dlist, filepath
, HUnit, QuickCheck, test-framework, test-framework-hunit
, test-framework-quickcheck2, transformers, transformers-compat
@@ -6635,7 +6605,6 @@ self: {
];
description = "Globbing library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"GlomeTrace" = callPackage
@@ -10208,6 +10177,8 @@ self: {
pname = "IORefCAS";
version = "0.2.0.1";
sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
+ revision = "1";
+ editedCabalFile = "0s01hpvl0dqb6lszp1s76li1i1k57j1bzhwhfwz552w85pxpv7ib";
libraryHaskellDepends = [ base bits-atomic ghc-prim ];
testHaskellDepends = [
base bits-atomic ghc-prim HUnit QuickCheck time
@@ -10677,14 +10648,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "JuicyPixels_3_3_1" = callPackage
+ "JuicyPixels_3_3_2" = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
, primitive, transformers, vector, zlib
}:
mkDerivation {
pname = "JuicyPixels";
- version = "3.3.1";
- sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza";
+ version = "3.3.2";
+ sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z";
libraryHaskellDepends = [
base binary bytestring containers deepseq mtl primitive
transformers vector zlib
@@ -15038,14 +15009,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "QuickCheck_2_12_4" = callPackage
+ "QuickCheck_2_12_6_1" = callPackage
({ mkDerivation, base, containers, deepseq, erf, process, random
, template-haskell, tf-random, transformers
}:
mkDerivation {
pname = "QuickCheck";
- version = "2.12.4";
- sha256 = "0pagxjsj2anyy1af0qc7b5mydblhnk3976bda3qxv47qp4kb5xn9";
+ version = "2.12.6.1";
+ sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb";
libraryHaskellDepends = [
base containers deepseq erf random template-haskell tf-random
transformers
@@ -15552,6 +15523,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Rasterific_0_7_4_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+ , free, JuicyPixels, mtl, primitive, transformers, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "Rasterific";
+ version = "0.7.4.1";
+ sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b";
+ libraryHaskellDepends = [
+ base bytestring containers dlist FontyFruity free JuicyPixels mtl
+ primitive transformers vector vector-algorithms
+ ];
+ description = "A pure haskell drawing engine";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ReadArgs" = callPackage
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
@@ -17381,8 +17370,8 @@ self: {
}:
mkDerivation {
pname = "StrictCheck";
- version = "0.1.0";
- sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z";
+ version = "0.1.1";
+ sha256 = "1mm1kyrrrwgxdjnafazggblcjlin3i8bjqrj6q0l7xrgllnqalv2";
libraryHaskellDepends = [
base bifunctors containers generics-sop QuickCheck template-haskell
];
@@ -21016,11 +21005,11 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "acme-smuggler";
- version = "0.1.0.1";
- sha256 = "1ivajii0gji1inc9qmli3ri3kyzcxyw90m469gs7a16kbprcs3kl";
+ version = "1.1.1.0";
+ sha256 = "0w4m213dcn07hxbnmkbrg2xgfdv9hlfz72ax9pcinswc10zwph1q";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
- description = "Smuggle arbitrary values in ()";
+ description = "Smuggle arbitrary values in arbitrary types";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -21113,6 +21102,8 @@ self: {
pname = "acquire";
version = "0.2.0.1";
sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+ revision = "1";
+ editedCabalFile = "1ihmdh0dpppgshsh7mxdz6bm9kn632xxd3g6nkigpjpfrb372q7z";
libraryHaskellDepends = [ base ];
description = "Abstraction over management of resources";
license = stdenv.lib.licenses.mit;
@@ -21684,34 +21675,6 @@ self: {
}) {};
"aeson-compat" = callPackage
- ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
- , base-compat, base-orphans, bytestring, containers, exceptions
- , hashable, QuickCheck, quickcheck-instances, scientific, tagged
- , tasty, tasty-hunit, tasty-quickcheck, text, time
- , time-locale-compat, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson-compat";
- version = "0.3.8";
- sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i";
- revision = "1";
- editedCabalFile = "0ayf5hkhl63lmlxpl7w5zvnz0lvpxb2rwmf0wbslff0y2s449mbf";
- libraryHaskellDepends = [
- aeson attoparsec attoparsec-iso8601 base base-compat bytestring
- containers exceptions hashable scientific tagged text time
- time-locale-compat unordered-containers vector
- ];
- testHaskellDepends = [
- aeson attoparsec base base-compat base-orphans bytestring
- containers exceptions hashable QuickCheck quickcheck-instances
- scientific tagged tasty tasty-hunit tasty-quickcheck text time
- time-locale-compat unordered-containers vector
- ];
- description = "Compatibility layer for aeson";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "aeson-compat_0_3_9" = callPackage
({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
, base-compat, base-orphans, bytestring, containers, exceptions
, hashable, QuickCheck, quickcheck-instances, scientific, tagged
@@ -21735,7 +21698,6 @@ self: {
];
description = "Compatibility layer for aeson";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-decode" = callPackage
@@ -22003,8 +21965,8 @@ self: {
({ mkDerivation, aeson, base }:
mkDerivation {
pname = "aeson-options";
- version = "0.0.0";
- sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0";
+ version = "0.1.0";
+ sha256 = "0d5wfcgsjrpmangknmrr2lxvr3h96d65y3vkkas6m9aqi1rrkqv4";
libraryHaskellDepends = [ aeson base ];
description = "Options to derive FromJSON/ToJSON instances";
license = stdenv.lib.licenses.mit;
@@ -22947,6 +22909,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "alarmclock_0_6_0_2" = callPackage
+ ({ mkDerivation, async, base, clock, hspec, stm, time
+ , unbounded-delays
+ }:
+ mkDerivation {
+ pname = "alarmclock";
+ version = "0.6.0.2";
+ sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc";
+ libraryHaskellDepends = [
+ async base clock stm time unbounded-delays
+ ];
+ testHaskellDepends = [
+ async base clock hspec stm time unbounded-delays
+ ];
+ description = "Wake up and perform an action at a certain time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alea" = callPackage
({ mkDerivation, base, optparse-applicative, random, text }:
mkDerivation {
@@ -23047,6 +23028,8 @@ self: {
pname = "alex-tools";
version = "0.4";
sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
+ revision = "1";
+ editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg";
libraryHaskellDepends = [ base deepseq template-haskell text ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
@@ -23072,17 +23055,6 @@ self: {
}) {};
"alg" = callPackage
- ({ mkDerivation, base, util }:
- mkDerivation {
- pname = "alg";
- version = "0.2.6.0";
- sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk";
- libraryHaskellDepends = [ base util ];
- description = "Algebraic structures";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "alg_0_2_7_0" = callPackage
({ mkDerivation, base, util }:
mkDerivation {
pname = "alg";
@@ -23091,7 +23063,6 @@ self: {
libraryHaskellDepends = [ base util ];
description = "Algebraic structures";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"alga" = callPackage
@@ -27347,8 +27318,8 @@ self: {
}:
mkDerivation {
pname = "apart";
- version = "0.1.1";
- sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan";
+ version = "0.1.3";
+ sha256 = "16y5k372kmqsn81bksl9j01nbfhsk0cwriwpfycjsnzgmg8wnkpb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -27367,14 +27338,14 @@ self: {
"apecs" = callPackage
({ mkDerivation, base, containers, criterion, linear, mtl
- , QuickCheck, stm, template-haskell, vector
+ , QuickCheck, template-haskell, vector
}:
mkDerivation {
pname = "apecs";
- version = "0.5.0.0";
- sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw";
+ version = "0.5.1.1";
+ sha256 = "1251i3nz2ipg21qyys34ilxi1bnchf4a2v4571l54kaysk8p8lhi";
libraryHaskellDepends = [
- base containers mtl stm template-haskell vector
+ base containers mtl template-haskell vector
];
testHaskellDepends = [
base containers criterion linear QuickCheck vector
@@ -27889,6 +27860,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "app-settings_0_2_0_12" = callPackage
+ ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
+ , parsec, text
+ }:
+ mkDerivation {
+ pname = "app-settings";
+ version = "0.2.0.12";
+ sha256 = "1nncn8vmq55m4b6zh77mdmx19d1s7z0af4pmz1v082bpf2wril9b";
+ libraryHaskellDepends = [
+ base containers directory mtl parsec text
+ ];
+ testHaskellDepends = [
+ base containers directory hspec HUnit mtl parsec text
+ ];
+ description = "A library to manage application settings (INI file-like)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"appar" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -29306,6 +29296,8 @@ self: {
pname = "asn1-codec";
version = "0.2.0";
sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
+ revision = "1";
+ editedCabalFile = "0d1m0i06i0agh64hbc182yrmd4lfwi6kwmms0gh2yh91ympmyd89";
libraryHaskellDepends = [
base bytestring containers contravariant cryptonite hashable
integer-gmp memory network pretty stm text vector
@@ -30354,6 +30346,8 @@ self: {
pname = "atto-lisp";
version = "0.2.2.3";
sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
+ revision = "1";
+ editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-textual bytestring containers
deepseq text
@@ -30548,19 +30542,6 @@ self: {
}) {};
"attoparsec-iso8601" = callPackage
- ({ mkDerivation, attoparsec, base, base-compat, text, time }:
- mkDerivation {
- pname = "attoparsec-iso8601";
- version = "1.0.0.0";
- sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a";
- revision = "1";
- editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4";
- libraryHaskellDepends = [ attoparsec base base-compat text time ];
- description = "Parsing of ISO 8601 dates, originally from aeson";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "attoparsec-iso8601_1_0_1_0" = callPackage
({ mkDerivation, attoparsec, base, base-compat, text, time }:
mkDerivation {
pname = "attoparsec-iso8601";
@@ -30569,7 +30550,6 @@ self: {
libraryHaskellDepends = [ attoparsec base base-compat text time ];
description = "Parsing of ISO 8601 dates, originally from aeson";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"attoparsec-iteratee" = callPackage
@@ -31227,8 +31207,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "24";
- editedCabalFile = "02n8p020d3p52ddsh38w5ih9kmx7qlp7axvxanli945fybjb2m5b";
+ revision = "25";
+ editedCabalFile = "11igp1sw7snsjcrw865rrcp1k14828yj5z9q9kdmn09f0hdl57rb";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -31480,6 +31460,8 @@ self: {
pname = "aws";
version = "0.18";
sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj";
+ revision = "1";
+ editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -32108,6 +32090,8 @@ self: {
pname = "axel";
version = "0.0.6";
sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh";
+ revision = "2";
+ editedCabalFile = "12m24klalqxpglh9slhr65sxqd4dsqcaz2abmw29cki0cz6x29dp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -32709,6 +32693,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bank-holidays-england_0_1_0_8" = callPackage
+ ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+ mkDerivation {
+ pname = "bank-holidays-england";
+ version = "0.1.0.8";
+ sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j";
+ libraryHaskellDepends = [ base containers time ];
+ testHaskellDepends = [ base containers hspec QuickCheck time ];
+ description = "Calculation of bank holidays in England and Wales";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"banwords" = callPackage
({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
, test-framework, test-framework-hunit, text, vector
@@ -32730,15 +32727,17 @@ self: {
}) {};
"barbies" = callPackage
- ({ mkDerivation, base, bifunctors, QuickCheck, tasty
+ ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
, tasty-quickcheck
}:
mkDerivation {
pname = "barbies";
- version = "0.1.4.0";
- sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada";
+ version = "1.0.0.0";
+ sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci";
libraryHaskellDepends = [ base bifunctors ];
- testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
description = "Classes for working with types that can change clothes";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -34068,8 +34067,8 @@ self: {
({ mkDerivation, base, bytestring, mtl, time }:
mkDerivation {
pname = "benchpress";
- version = "0.2.2.11";
- sha256 = "07blpjp84f3xycnrg0dwz3rvlm665dxri2ch54145qd4rxy9hlln";
+ version = "0.2.2.12";
+ sha256 = "0r5b1mdjm08nsxni1qzwq3kap13jflcq7ksd30zl7vaxgz9yhwfm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl time ];
@@ -35012,6 +35011,8 @@ self: {
pname = "binary-serialise-cbor";
version = "0.2.0.0";
sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv";
+ revision = "1";
+ editedCabalFile = "1dkranaa9fn81z0x75b1dblnph9d0pvzzz0jpz374lqsxaimqgp6";
libraryHaskellDepends = [ base bytestring cborg serialise ];
description = "Yet Another Binary Serialisation Library (compatibility shim)";
license = stdenv.lib.licenses.bsd3;
@@ -35094,39 +35095,6 @@ self: {
}) {};
"binary-tagged" = callPackage
- ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
- , binary, binary-orphans, bytestring, containers, criterion
- , deepseq, generics-sop, hashable, nats, quickcheck-instances
- , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
- , text, time, unordered-containers, vector
- }:
- mkDerivation {
- pname = "binary-tagged";
- version = "0.1.5";
- sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl";
- revision = "1";
- editedCabalFile = "0vddb305g3455f0rh0xs6c9i2vllnf83y0pbp53wjwb3l575bqyp";
- libraryHaskellDepends = [
- aeson array base base16-bytestring binary bytestring containers
- generics-sop hashable scientific SHA tagged text time
- unordered-containers vector
- ];
- testHaskellDepends = [
- aeson array base base16-bytestring bifunctors binary binary-orphans
- bytestring containers generics-sop hashable quickcheck-instances
- scientific SHA tagged tasty tasty-quickcheck text time
- unordered-containers vector
- ];
- benchmarkHaskellDepends = [
- aeson array base base16-bytestring binary binary-orphans bytestring
- containers criterion deepseq generics-sop hashable nats scientific
- semigroups SHA tagged text time unordered-containers vector
- ];
- description = "Tagged binary serialisation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "binary-tagged_0_1_5_1" = callPackage
({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
, binary, binary-orphans, bytestring, containers, criterion
, deepseq, generics-sop, hashable, nats, quickcheck-instances
@@ -35155,7 +35123,6 @@ self: {
];
description = "Tagged binary serialisation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"binary-tree" = callPackage
@@ -37566,23 +37533,6 @@ self: {
}) {};
"blaze-markup" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
- , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "blaze-markup";
- version = "0.8.2.1";
- sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
- libraryHaskellDepends = [ base blaze-builder bytestring text ];
- testHaskellDepends = [
- base blaze-builder bytestring containers HUnit QuickCheck tasty
- tasty-hunit tasty-quickcheck text
- ];
- description = "A blazingly fast markup combinator library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "blaze-markup_0_8_2_2" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
}:
@@ -37597,7 +37547,6 @@ self: {
];
description = "A blazingly fast markup combinator library for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"blaze-shields" = callPackage
@@ -39081,6 +39030,8 @@ self: {
pname = "brick";
version = "0.37.2";
sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
+ revision = "1";
+ editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -39358,6 +39309,8 @@ self: {
pname = "broadcast-chan";
version = "0.2.0.1";
sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf";
+ revision = "2";
+ editedCabalFile = "1vvs1m5n6lflmp8hdxksxa4ibllfx609y791wg21lvyz5m208hp9";
libraryHaskellDepends = [ base unliftio-core ];
benchmarkHaskellDepends = [ async base criterion deepseq stm ];
description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
@@ -39503,17 +39456,17 @@ self: {
"bsb-http-chunked" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, bytestring
- , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups
- , tasty, tasty-hedgehog, tasty-hunit
+ , deepseq, doctest, gauge, hedgehog, semigroups, tasty
+ , tasty-hedgehog, tasty-hunit
}:
mkDerivation {
pname = "bsb-http-chunked";
- version = "0.0.0.3";
- sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4";
- libraryHaskellDepends = [ base bytestring bytestring-builder ];
+ version = "0.0.0.4";
+ sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql";
+ libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
- attoparsec base blaze-builder bytestring bytestring-builder doctest
- hedgehog tasty tasty-hedgehog tasty-hunit
+ attoparsec base blaze-builder bytestring doctest hedgehog tasty
+ tasty-hedgehog tasty-hunit
];
benchmarkHaskellDepends = [
base blaze-builder bytestring deepseq gauge semigroups
@@ -40274,8 +40227,8 @@ self: {
}:
mkDerivation {
pname = "bv-little";
- version = "0.1.1";
- sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8";
+ version = "0.1.2";
+ sha256 = "0xscq4qjwisqiykdhiirxc58gsrmabvxmxwxw80f2m6ia103k3cc";
libraryHaskellDepends = [
base deepseq hashable integer-gmp mono-traversable primitive
QuickCheck
@@ -40457,18 +40410,6 @@ self: {
}) {};
"bytestring-builder" = callPackage
- ({ mkDerivation, base, bytestring, deepseq }:
- mkDerivation {
- pname = "bytestring-builder";
- version = "0.10.8.1.0";
- sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
- libraryHaskellDepends = [ base bytestring deepseq ];
- doHaddock = false;
- description = "The new bytestring builder, packaged outside of GHC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bytestring-builder_0_10_8_2_0" = callPackage
({ mkDerivation, base, bytestring, deepseq }:
mkDerivation {
pname = "bytestring-builder";
@@ -40478,7 +40419,6 @@ self: {
doHaddock = false;
description = "The new bytestring builder, packaged outside of GHC";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bytestring-builder-varword" = callPackage
@@ -41065,32 +41005,6 @@ self: {
}) {};
"c2hs" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, directory
- , dlist, filepath, HUnit, language-c, pretty, process, shelly
- , test-framework, test-framework-hunit, text, transformers
- }:
- mkDerivation {
- pname = "c2hs";
- version = "0.28.5";
- sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
- revision = "1";
- editedCabalFile = "1d6i1wr1kbn61yi7nk1scjfm2800vm2ynnx7555fjkdx4d8va711";
- isLibrary = false;
- isExecutable = true;
- enableSeparateDataOutput = true;
- executableHaskellDepends = [
- array base bytestring containers directory dlist filepath
- language-c pretty process
- ];
- testHaskellDepends = [
- base filepath HUnit shelly test-framework test-framework-hunit text
- transformers
- ];
- description = "C->Haskell FFI tool that gives some cross-language type safety";
- license = stdenv.lib.licenses.gpl2;
- }) {};
-
- "c2hs_0_28_6" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, dlist, filepath, HUnit, language-c, pretty, process, shelly
, test-framework, test-framework-hunit, text, transformers
@@ -41112,7 +41026,6 @@ self: {
];
description = "C->Haskell FFI tool that gives some cross-language type safety";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"c2hs-extra" = callPackage
@@ -41617,6 +41530,8 @@ self: {
pname = "cabal-lenses";
version = "0.8.0";
sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60";
+ revision = "1";
+ editedCabalFile = "1ij976phgmx7y7v9kbbwqqfkm8vnrggh1qry6wsbbq7f6qb0c0dq";
libraryHaskellDepends = [
base Cabal lens strict system-fileio system-filepath text
transformers unordered-containers
@@ -42315,59 +42230,6 @@ self: {
}) {};
"cachix" = callPackage
- ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
- , bifunctors, bytestring, cachix-api, conduit, conduit-extra
- , cookie, cryptonite, dhall, directory, ed25519, fsnotify, here
- , hspec, hspec-discover, http-client, http-client-tls, http-conduit
- , http-types, lzma-conduit, megaparsec, memory, mmorph
- , optparse-applicative, process, protolude, resourcet, servant
- , servant-auth, servant-auth-client, servant-client
- , servant-client-core, servant-streaming-client, streaming, text
- , unix, uri-bytestring, versions
- }:
- mkDerivation {
- pname = "cachix";
- version = "0.1.1";
- sha256 = "0jhjan72dp18dblrb7v4h4h4ffvii7n4dwmpgfyjn8kndmxkaqbd";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async base base16-bytestring base64-bytestring bifunctors
- bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
- ];
- executableHaskellDepends = [
- async base base16-bytestring base64-bytestring bifunctors
- bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
- ];
- executableToolDepends = [ hspec-discover ];
- testHaskellDepends = [
- async base base16-bytestring base64-bytestring bifunctors
- bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here hspec http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
- ];
- description = "Command line client for Nix binary cache hosting https://cachix.org";
- license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "cachix_0_1_2" = callPackage
({ mkDerivation, async, base, base16-bytestring, base64-bytestring
, bifunctors, bytestring, cachix-api, conduit, conduit-extra
, cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
@@ -42421,48 +42283,6 @@ self: {
}) {};
"cachix-api" = callPackage
- ({ mkDerivation, aeson, amazonka, base, base16-bytestring
- , bytestring, conduit, conduit-combinators, cookie, cryptonite
- , hspec, hspec-discover, http-api-data, http-media, lens, memory
- , protolude, servant, servant-auth, servant-auth-server
- , servant-auth-swagger, servant-streaming, servant-swagger
- , servant-swagger-ui-core, string-conv, swagger2, text
- , transformers
- }:
- mkDerivation {
- pname = "cachix-api";
- version = "0.1.0.1";
- sha256 = "0z9dbci88qyyqc4b8kl6ab3k8yvgnmswi590qwyjvhc6va2fn3y6";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite http-api-data http-media lens
- memory servant servant-auth servant-auth-server
- servant-auth-swagger servant-streaming servant-swagger
- servant-swagger-ui-core string-conv swagger2 text transformers
- ];
- executableHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite http-api-data http-media lens
- memory servant servant-auth servant-auth-server
- servant-auth-swagger servant-streaming servant-swagger
- servant-swagger-ui-core string-conv swagger2 text transformers
- ];
- testHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite hspec http-api-data
- http-media lens memory protolude servant servant-auth
- servant-auth-server servant-auth-swagger servant-streaming
- servant-swagger servant-swagger-ui-core string-conv swagger2 text
- transformers
- ];
- testToolDepends = [ hspec-discover ];
- description = "Servant HTTP API specification for https://cachix.org";
- license = stdenv.lib.licenses.asl20;
- }) {};
-
- "cachix-api_0_1_0_2" = callPackage
({ mkDerivation, aeson, amazonka, base, base16-bytestring
, bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
, http-api-data, http-media, lens, memory, protolude, servant
@@ -42500,7 +42320,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Servant HTTP API specification for https://cachix.org";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cacophony" = callPackage
@@ -43919,6 +43738,27 @@ self: {
}) {};
"cassava-megaparsec" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, containers, hspec
+ , hspec-megaparsec, megaparsec, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "cassava-megaparsec";
+ version = "1.0.0";
+ sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28";
+ revision = "1";
+ editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6";
+ libraryHaskellDepends = [
+ base bytestring cassava containers megaparsec unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ base bytestring cassava hspec hspec-megaparsec vector
+ ];
+ description = "Megaparsec parser of CSV files that plays nicely with Cassava";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "cassava-megaparsec_2_0_0" = callPackage
({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec
, megaparsec, unordered-containers, vector
}:
@@ -43934,6 +43774,7 @@ self: {
];
description = "Megaparsec parser of CSV files that plays nicely with Cassava";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cassava-records" = callPackage
@@ -47958,6 +47799,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) glib; inherit (pkgs) mono;};
+ "clr-host_0_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory
+ , file-embed, filepath, glib, mono, text, transformers
+ }:
+ mkDerivation {
+ pname = "clr-host";
+ version = "0.2.1.0";
+ sha256 = "192yzi7xx2hrk2q0i4qzq0plam2b0xgg9r5s3kjzcvf9hq1vyapy";
+ setupHaskellDepends = [
+ base Cabal directory filepath transformers
+ ];
+ libraryHaskellDepends = [
+ base bytestring clr-marshal file-embed text
+ ];
+ librarySystemDepends = [ glib mono ];
+ testHaskellDepends = [ base ];
+ description = "Hosting the Common Language Runtime";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+
"clr-inline" = callPackage
({ mkDerivation, base, bytestring, Cabal, case-insensitive
, clr-host, clr-marshal, containers, criterion, directory, extra
@@ -48493,23 +48355,21 @@ self: {
}) {};
"co-log" = callPackage
- ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
+ ({ mkDerivation, ansi-terminal, base, base-noprelude, bytestring
, co-log-core, containers, contravariant, markdown-unlit, mtl
, relude, text, time, transformers, typerep-map
}:
mkDerivation {
pname = "co-log";
- version = "0.0.0";
- sha256 = "0bx45ffb1d7sdxcc7srx8sxb6qwjjs8gf90mnr3q1b76b2iczklp";
+ version = "0.1.0";
+ sha256 = "101ajw1qckc7nin5ard3dcamhz447qv0wv1wvnid8xmw9zsjf7gg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base-noprelude bytestring co-log-core containers
contravariant mtl relude text time transformers typerep-map
];
- executableHaskellDepends = [
- base-noprelude relude text typerep-map
- ];
+ executableHaskellDepends = [ base relude text typerep-map ];
executableToolDepends = [ markdown-unlit ];
description = "Logging library";
license = stdenv.lib.licenses.mpl20;
@@ -48519,8 +48379,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "co-log-core";
- version = "0.0.0";
- sha256 = "1xml4qbvjlgcqvh0kmgqm2wr50bzd252a40zpc84sk6kg8a3x734";
+ version = "0.1.0";
+ sha256 = "1yxz7p5df70r0327gxfip2nwjh8gsc2fh1i6bjaf9yzfccar69xx";
libraryHaskellDepends = [ base ];
description = "Logging library";
license = stdenv.lib.licenses.mpl20;
@@ -50853,22 +50713,6 @@ self: {
}) {};
"concurrency" = callPackage
- ({ mkDerivation, array, atomic-primops, base, exceptions
- , monad-control, mtl, stm, transformers
- }:
- mkDerivation {
- pname = "concurrency";
- version = "1.6.0.0";
- sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk";
- 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;
- }) {};
-
- "concurrency_1_6_1_0" = callPackage
({ mkDerivation, array, atomic-primops, base, exceptions
, monad-control, mtl, stm, transformers
}:
@@ -50882,7 +50726,6 @@ self: {
];
description = "Typeclasses, functions, and data types for concurrency and STM";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"concurrency-benchmarks" = callPackage
@@ -51014,22 +50857,6 @@ self: {
}) {};
"concurrent-output" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
- , process, stm, terminal-size, text, transformers, unix
- }:
- mkDerivation {
- pname = "concurrent-output";
- version = "1.10.6";
- sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
- libraryHaskellDepends = [
- ansi-terminal async base directory exceptions process stm
- terminal-size text transformers unix
- ];
- description = "Ungarble output from several threads or commands";
- license = stdenv.lib.licenses.bsd2;
- }) {};
-
- "concurrent-output_1_10_7" = callPackage
({ mkDerivation, ansi-terminal, async, base, directory, exceptions
, process, stm, terminal-size, text, transformers, unix
}:
@@ -51043,7 +50870,6 @@ self: {
];
description = "Ungarble output from several threads or commands";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"concurrent-rpc" = callPackage
@@ -51291,41 +51117,6 @@ self: {
}) {};
"conduit-algorithms" = callPackage
- ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
- , conduit-combinators, conduit-extra, containers, criterion
- , deepseq, directory, exceptions, HUnit, lzma-conduit
- , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
- , streaming-commons, test-framework, test-framework-hunit
- , test-framework-th, transformers, unliftio-core, vector
- }:
- mkDerivation {
- pname = "conduit-algorithms";
- version = "0.0.8.1";
- sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd";
- libraryHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra containers deepseq exceptions lzma-conduit
- monad-control mtl pqueue resourcet stm stm-conduit
- streaming-commons transformers unliftio-core vector
- ];
- testHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra containers deepseq directory exceptions HUnit
- lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
- streaming-commons test-framework test-framework-hunit
- test-framework-th transformers unliftio-core vector
- ];
- benchmarkHaskellDepends = [
- async base bytestring bzlib-conduit conduit conduit-combinators
- conduit-extra containers criterion deepseq exceptions lzma-conduit
- monad-control mtl pqueue resourcet stm stm-conduit
- streaming-commons transformers unliftio-core vector
- ];
- description = "Conduit-based algorithms";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "conduit-algorithms_0_0_8_2" = callPackage
({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
, conduit-combinators, conduit-extra, containers, criterion
, deepseq, directory, exceptions, HUnit, lzma-conduit
@@ -51358,7 +51149,6 @@ self: {
];
description = "Conduit-based algorithms";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"conduit-audio" = callPackage
@@ -51810,6 +51600,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "config-ini_0_2_3_0" = callPackage
+ ({ mkDerivation, base, containers, directory, hedgehog, ini
+ , megaparsec, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "config-ini";
+ version = "0.2.3.0";
+ sha256 = "03sv2y9ax3jqcfydfzfvmsixl8qch2zym3sr065pjsh8qxrknkqc";
+ libraryHaskellDepends = [
+ base containers megaparsec text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers directory hedgehog ini text unordered-containers
+ ];
+ description = "A library for simple INI-based configuration files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"config-manager" = callPackage
({ mkDerivation, base, directory, filepath, HUnit, parsec
, temporary, test-framework, test-framework-hunit, text, time
@@ -55220,20 +55029,6 @@ self: {
}) {};
"crypto-enigma" = callPackage
- ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
- , split
- }:
- mkDerivation {
- pname = "crypto-enigma";
- version = "0.0.2.12";
- sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
- libraryHaskellDepends = [ base containers MissingH mtl split ];
- testHaskellDepends = [ base HUnit QuickCheck ];
- description = "An Enigma machine simulator with display";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "crypto-enigma_0_0_2_13" = callPackage
({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
, split
}:
@@ -55245,7 +55040,6 @@ self: {
testHaskellDepends = [ base HUnit QuickCheck ];
description = "An Enigma machine simulator with display";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"crypto-multihash" = callPackage
@@ -56329,8 +56123,8 @@ self: {
}:
mkDerivation {
pname = "cublas";
- version = "0.4.0.1";
- sha256 = "0fk0yrm6arb85xxy7vr2bnkxgwassahfcl8lf9k99s9f9wqc9glr";
+ version = "0.5.0.0";
+ sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [
base cuda half storable-complex template-haskell
@@ -56356,17 +56150,17 @@ self: {
"cuda" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , pretty, template-haskell
+ , pretty, template-haskell, uuid-types
}:
mkDerivation {
pname = "cuda";
- version = "0.9.0.3";
- sha256 = "0ym5j3rllxyl9zqji47pngwbi032hzm0bv5j06756d5cb769k44q";
+ version = "0.10.0.0";
+ sha256 = "17l482fnackx4081mxax0dx0bsaqbbg4rxy4zmi5iv5q6f6v37x7";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
- base bytestring filepath template-haskell
+ base bytestring filepath template-haskell uuid-types
];
libraryToolDepends = [ c2hs ];
executableHaskellDepends = [ base pretty ];
@@ -56397,8 +56191,8 @@ self: {
pname = "cue-sheet";
version = "1.0.1";
sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
- revision = "2";
- editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x";
+ revision = "3";
+ editedCabalFile = "14kgk1digf1vbsr7v5jvj8gajkx0rkn3zjl4m8csqhxalkaxa2zl";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class exceptions megaparsec
@@ -56421,6 +56215,8 @@ self: {
pname = "cue-sheet";
version = "2.0.0";
sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql";
+ revision = "1";
+ editedCabalFile = "0cnlyy7psk8qcwahiqfdpaybvrw899bv106p0i53lrdjxfdsmf4g";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class exceptions megaparsec
@@ -56442,8 +56238,8 @@ self: {
}:
mkDerivation {
pname = "cufft";
- version = "0.9.0.0";
- sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv";
+ version = "0.9.0.1";
+ sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3";
setupHaskellDepends = [
base Cabal cuda directory filepath template-haskell
];
@@ -56728,15 +56524,15 @@ self: {
"cusolver" = callPackage
({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
- , directory, filepath, half, storable-complex
+ , directory, filepath, half, storable-complex, template-haskell
}:
mkDerivation {
pname = "cusolver";
- version = "0.1.0.1";
- sha256 = "1wjwdhy51pzvhvr50v7b1s9ljgk001wp9qlmwkkjih0csk79047k";
+ version = "0.2.0.0";
+ sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [
- base cublas cuda cusparse half storable-complex
+ base cublas cuda cusparse half storable-complex template-haskell
];
libraryToolDepends = [ c2hs ];
description = "FFI bindings to CUDA Solver, a LAPACK-like library";
@@ -56750,8 +56546,8 @@ self: {
}:
mkDerivation {
pname = "cusparse";
- version = "0.1.0.1";
- sha256 = "1fsldpi4bglh875fc9blki3mlz14dal2j37651br1l587ky1v55w";
+ version = "0.2.0.0";
+ sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [ base cuda half storable-complex ];
libraryToolDepends = [ c2hs ];
@@ -58745,17 +58541,6 @@ self: {
}) {};
"data-ref" = callPackage
- ({ mkDerivation, base, stm, transformers }:
- mkDerivation {
- pname = "data-ref";
- version = "0.0.1.1";
- sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4";
- libraryHaskellDepends = [ base stm transformers ];
- description = "Unify STRef and IORef in plain Haskell 98";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-ref_0_0_1_2" = callPackage
({ mkDerivation, base, stm, transformers }:
mkDerivation {
pname = "data-ref";
@@ -58764,7 +58549,6 @@ self: {
libraryHaskellDepends = [ base stm transformers ];
description = "Unify STRef and IORef in plain Haskell 98";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-reify" = callPackage
@@ -60689,8 +60473,10 @@ self: {
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.9.7.1";
- sha256 = "1mnibf7k40p8y8iqfd28q51nmdz5l3lpmillma2lzbysw24xr6qk";
+ version = "0.9.8";
+ sha256 = "0lrp0dzg6ihm1if2qq6i1dmrwfpnwvyr45yrc8ans0ar9jnrgrn3";
+ revision = "1";
+ editedCabalFile = "08pnfyy4vfwmvyma0h0jwil7p27y5bz9wzihy3kcc6283v9hkh52";
libraryHaskellDepends = [
base bytestring containers foldl hashable primitive transformers
unordered-containers vector
@@ -61419,8 +61205,8 @@ self: {
}:
mkDerivation {
pname = "derive-storable-plugin";
- version = "0.2.1.0";
- sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi";
+ version = "0.2.2.0";
+ sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0";
libraryHaskellDepends = [ base derive-storable ghc ghci ];
testHaskellDepends = [
base derive-storable ghc ghc-paths ghci hspec QuickCheck
@@ -61483,29 +61269,6 @@ self: {
}) {};
"deriving-compat" = callPackage
- ({ mkDerivation, base, base-compat, base-orphans, containers
- , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
- , template-haskell, th-abstraction, transformers
- , transformers-compat
- }:
- mkDerivation {
- pname = "deriving-compat";
- version = "0.5.1";
- sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy";
- libraryHaskellDepends = [
- base containers ghc-boot-th ghc-prim template-haskell
- th-abstraction transformers transformers-compat
- ];
- testHaskellDepends = [
- base base-compat base-orphans hspec QuickCheck tagged
- template-haskell transformers transformers-compat
- ];
- testToolDepends = [ hspec-discover ];
- description = "Backports of GHC deriving extensions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "deriving-compat_0_5_2" = callPackage
({ mkDerivation, base, base-compat, base-orphans, containers
, ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
, template-haskell, th-abstraction, transformers
@@ -61526,7 +61289,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Backports of GHC deriving extensions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"derp" = callPackage
@@ -62176,14 +61938,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "di_1_1_1" = callPackage
+ "di_1_2" = callPackage
({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
, di-monad, exceptions
}:
mkDerivation {
pname = "di";
- version = "1.1.1";
- sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk";
+ version = "1.2";
+ sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b";
libraryHaskellDepends = [
base containers df1 di-core di-df1 di-handle di-monad exceptions
];
@@ -62260,14 +62022,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "di-monad_1_2" = callPackage
+ "di-monad_1_3" = callPackage
({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
, stm, transformers
}:
mkDerivation {
pname = "di-monad";
- version = "1.2";
- sha256 = "1zqgsylx6z6p0cvlyhl7vnff5sb4jlv9qzqgbz8kg3zli183gwc3";
+ version = "1.3";
+ sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl";
libraryHaskellDepends = [
base containers di-core exceptions mtl pipes stm transformers
];
@@ -63838,8 +63600,10 @@ self: {
}:
mkDerivation {
pname = "dirstream";
- version = "1.0.3";
- sha256 = "1yga8qzmarskjlnz7wnkrjiv438m2yswz640bcw8dawwqk8xf1x4";
+ version = "1.1.0";
+ sha256 = "1xnxsx1m06jm8yvim1xnvfkwylhyab51wvba1j3fbicy4ysblfz0";
+ revision = "1";
+ editedCabalFile = "01bl222ymniz3q7nbpbxhbckvwqgrawrk553widw5d0hnn0h0hnb";
libraryHaskellDepends = [
base directory pipes pipes-safe system-fileio system-filepath unix
];
@@ -64222,22 +63986,6 @@ self: {
}) {};
"distributed-closure" = callPackage
- ({ mkDerivation, base, binary, bytestring, constraints, hspec
- , QuickCheck, syb, template-haskell
- }:
- mkDerivation {
- pname = "distributed-closure";
- version = "0.4.0";
- sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm";
- libraryHaskellDepends = [
- base binary bytestring constraints syb template-haskell
- ];
- testHaskellDepends = [ base binary hspec QuickCheck ];
- description = "Serializable closures for distributed programming";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "distributed-closure_0_4_1" = callPackage
({ mkDerivation, async, base, binary, bytestring, constraints
, hspec, QuickCheck, syb, template-haskell
}:
@@ -64254,7 +64002,6 @@ self: {
testHaskellDepends = [ base binary hspec QuickCheck ];
description = "Serializable closures for distributed programming";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"distributed-fork" = callPackage
@@ -65068,18 +64815,6 @@ self: {
}) {};
"dlist" = callPackage
- ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
- mkDerivation {
- pname = "dlist";
- version = "0.8.0.4";
- sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "dlist_0_8_0_5" = callPackage
({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
mkDerivation {
pname = "dlist";
@@ -65089,7 +64824,6 @@ self: {
testHaskellDepends = [ base Cabal QuickCheck ];
description = "Difference lists";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dlist-instances" = callPackage
@@ -65333,6 +65067,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "do-notation-dsl" = callPackage
+ ({ mkDerivation, base, containers, doctest, doctest-discover
+ , temporary
+ }:
+ mkDerivation {
+ pname = "do-notation-dsl";
+ version = "0.1.0.3";
+ sha256 = "1q81hl8z4p2mqzijg69znf5cycv27phrrdd9f934brsv8fyvsbzx";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers doctest doctest-discover temporary
+ ];
+ description = "An alternative to monads";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"doc-review" = callPackage
({ mkDerivation, base, base64-bytestring, binary, bytestring
, containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -65564,35 +65314,6 @@ self: {
}) {};
"doctest" = callPackage
- ({ mkDerivation, base, base-compat, code-page, deepseq, directory
- , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
- , QuickCheck, setenv, silently, stringbuilder, syb, transformers
- , with-location
- }:
- mkDerivation {
- pname = "doctest";
- version = "0.16.0";
- sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
- ];
- executableHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
- ];
- testHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- hspec HUnit mockery process QuickCheck setenv silently
- stringbuilder syb transformers with-location
- ];
- description = "Test interactive Haskell examples";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "doctest_0_16_0_1" = callPackage
({ mkDerivation, base, base-compat, code-page, deepseq, directory
, filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
, QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -65619,7 +65340,6 @@ self: {
];
description = "Test interactive Haskell examples";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"doctest-discover" = callPackage
@@ -69763,10 +69483,10 @@ self: {
}:
mkDerivation {
pname = "engine-io";
- version = "1.2.21";
- sha256 = "0rqpxvw2d2m5hlgkc2a3794874dig84vph1wkqnlrv2vxixkqplw";
+ version = "1.2.22";
+ sha256 = "19hmd804r9k20270zlsfbsyvww5syi5h3nl74klvgmni39ahcxcl";
revision = "1";
- editedCabalFile = "1n5l2fs0wn7wps2nr8irymrfac2qris75z3p73mmlxrdxmbjb2vr";
+ editedCabalFile = "098nkv1zrc4b80137pxdz87by83bla9cbsv6920cpbspkic8x9xz";
libraryHaskellDepends = [
aeson async attoparsec base base64-bytestring bytestring errors
free monad-loops mwc-random stm stm-delay text transformers
@@ -69878,20 +69598,6 @@ self: {
}) {};
"entropy" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , process, unix
- }:
- mkDerivation {
- pname = "entropy";
- version = "0.4.1.1";
- sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
- setupHaskellDepends = [ base Cabal directory filepath process ];
- libraryHaskellDepends = [ base bytestring unix ];
- description = "A platform independent entropy source";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "entropy_0_4_1_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, process, unix
}:
@@ -69903,7 +69609,6 @@ self: {
libraryHaskellDepends = [ base bytestring unix ];
description = "A platform independent entropy source";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"entwine" = callPackage
@@ -70027,6 +69732,8 @@ self: {
pname = "enumerator";
version = "0.4.20";
sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
+ revision = "1";
+ editedCabalFile = "10mn8a6sj7fvcprfmngr5z1h434k6yhdij064lqxjpiqyr1srg9z";
libraryHaskellDepends = [
base bytestring containers text transformers
];
@@ -70403,29 +70110,6 @@ self: {
}) {};
"equivalence" = callPackage
- ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
- , template-haskell, test-framework, test-framework-quickcheck2
- , transformers, transformers-compat
- }:
- mkDerivation {
- pname = "equivalence";
- version = "0.3.2";
- sha256 = "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx";
- revision = "1";
- editedCabalFile = "010n0gpk2rpninggdnnx0j7fys6hzn80s789b16iw0a55h4z0gn8";
- libraryHaskellDepends = [
- base containers mtl STMonadTrans transformers transformers-compat
- ];
- testHaskellDepends = [
- base containers mtl QuickCheck STMonadTrans template-haskell
- test-framework test-framework-quickcheck2 transformers
- transformers-compat
- ];
- description = "Maintaining an equivalence relation implemented as union-find using STT";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "equivalence_0_3_3" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
, template-haskell, test-framework, test-framework-quickcheck2
, transformers, transformers-compat
@@ -70444,7 +70128,6 @@ self: {
];
description = "Maintaining an equivalence relation implemented as union-find using STT";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"erd" = callPackage
@@ -70948,6 +70631,8 @@ self: {
pname = "esqueleto";
version = "2.5.3";
sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x";
+ revision = "1";
+ editedCabalFile = "1rmqqx2p4bad6psg8jbzf6jwan9z4a5yjskdkw51q0f47jhpfcdj";
libraryHaskellDepends = [
base blaze-html bytestring conduit monad-logger persistent
resourcet tagged text transformers unordered-containers
@@ -72061,6 +71746,8 @@ self: {
pname = "exception-transformers";
version = "0.4.0.7";
sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+ revision = "1";
+ editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f";
libraryHaskellDepends = [
base stm transformers transformers-compat
];
@@ -72395,8 +72082,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "exit-codes";
- version = "0.1.1.0";
- sha256 = "0v8z5wkhyavd7zzcfbjm229mbgp1xcjbz9mvcxnjikcljn5xi181";
+ version = "1.0.0";
+ sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja";
libraryHaskellDepends = [ base ];
description = "Exit codes as defined by BSD";
license = stdenv.lib.licenses.bsd3;
@@ -72482,6 +72169,8 @@ self: {
pname = "exp-pairs";
version = "0.1.6.0";
sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
+ revision = "1";
+ editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3";
libraryHaskellDepends = [
base containers deepseq ghc-prim prettyprinter
];
@@ -72493,6 +72182,29 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "exp-pairs_0_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
+ , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "exp-pairs";
+ version = "0.2.0.0";
+ sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp";
+ revision = "1";
+ editedCabalFile = "1fkllbgsygzm1lw3g3a9l8fg8ap74bx0x7ja8yx3lbrjjsaqh8pa";
+ libraryHaskellDepends = [
+ base containers deepseq ghc-prim prettyprinter
+ ];
+ testHaskellDepends = [
+ base matrix QuickCheck random smallcheck tasty tasty-hunit
+ tasty-quickcheck tasty-smallcheck
+ ];
+ description = "Linear programming over exponent pairs";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"expand" = callPackage
({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }:
mkDerivation {
@@ -72820,8 +72532,8 @@ self: {
pname = "extended-reals";
version = "0.2.3.0";
sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
- revision = "1";
- editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
+ revision = "2";
+ editedCabalFile = "020aliazf97zrhkcdpblmh9xakabdd8wdxg0667j4553rsijwqcy";
libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [
base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -72976,22 +72688,6 @@ self: {
}) {};
"extra" = callPackage
- ({ mkDerivation, base, clock, directory, filepath, process
- , QuickCheck, time, unix
- }:
- mkDerivation {
- pname = "extra";
- version = "1.6.9";
- sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b";
- libraryHaskellDepends = [
- base clock directory filepath process time unix
- ];
- testHaskellDepends = [ base directory filepath QuickCheck unix ];
- description = "Extra functions I use";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "extra_1_6_12" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
, QuickCheck, time, unix
}:
@@ -73005,7 +72701,6 @@ self: {
testHaskellDepends = [ base directory filepath QuickCheck unix ];
description = "Extra functions I use";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extract-dependencies" = callPackage
@@ -74873,6 +74568,8 @@ self: {
pname = "fgl";
version = "5.6.0.0";
sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
+ revision = "1";
+ editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70";
libraryHaskellDepends = [
array base containers deepseq transformers
];
@@ -75734,8 +75431,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "first-class-families";
- version = "0.2.0.0";
- sha256 = "0lwxz2dv0mcls0ww00h1x92gn4gdrz49arrl21lwqs1lf3q748f5";
+ version = "0.3.0.1";
+ sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib";
libraryHaskellDepends = [ base ];
description = "First class type families";
license = stdenv.lib.licenses.mit;
@@ -77245,22 +76942,6 @@ self: {
}) {};
"fold-debounce" = callPackage
- ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
- , time
- }:
- mkDerivation {
- pname = "fold-debounce";
- version = "0.2.0.7";
- sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz";
- libraryHaskellDepends = [
- base data-default-class stm stm-delay time
- ];
- testHaskellDepends = [ base hspec stm time ];
- description = "Fold multiple events that happen in a given period of time";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "fold-debounce_0_2_0_8" = callPackage
({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
, time
}:
@@ -77274,7 +76955,6 @@ self: {
testHaskellDepends = [ base hspec stm time ];
description = "Fold multiple events that happen in a given period of time";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fold-debounce-conduit" = callPackage
@@ -77283,8 +76963,8 @@ self: {
}:
mkDerivation {
pname = "fold-debounce-conduit";
- version = "0.2.0.1";
- sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z";
+ version = "0.2.0.2";
+ sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
libraryHaskellDepends = [
base conduit fold-debounce resourcet stm transformers
transformers-base
@@ -77296,14 +76976,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fold-debounce-conduit_0_2_0_2" = callPackage
+ "fold-debounce-conduit_0_2_0_3" = callPackage
({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
, stm, transformers, transformers-base
}:
mkDerivation {
pname = "fold-debounce-conduit";
- version = "0.2.0.2";
- sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
+ version = "0.2.0.3";
+ sha256 = "0rzgaxqv3q0s848bk3hm0mq14sxa1szpxvi9k19n0hpqlx60rj4p";
libraryHaskellDepends = [
base conduit fold-debounce resourcet stm transformers
transformers-base
@@ -81452,6 +81132,8 @@ self: {
pname = "generic-random";
version = "1.2.0.0";
sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv";
+ revision = "1";
+ editedCabalFile = "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4";
libraryHaskellDepends = [ base QuickCheck ];
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Generic random generators";
@@ -81785,6 +81467,8 @@ self: {
pname = "geniplate-mirror";
version = "0.7.6";
sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb";
+ revision = "1";
+ editedCabalFile = "1pyz2vdkr5w9wadmb5v4alx408dqamny3mkvl4x8v2pf549qn37k";
libraryHaskellDepends = [ base mtl template-haskell ];
description = "Use Template Haskell to generate Uniplate-like functions";
license = stdenv.lib.licenses.bsd3;
@@ -83236,27 +82920,6 @@ self: {
}) {};
"ghc-prof" = callPackage
- ({ mkDerivation, attoparsec, base, containers, directory, filepath
- , process, scientific, tasty, tasty-hunit, temporary, text, time
- }:
- mkDerivation {
- pname = "ghc-prof";
- version = "1.4.1.3";
- sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base containers scientific text time
- ];
- testHaskellDepends = [
- attoparsec base containers directory filepath process tasty
- tasty-hunit temporary text
- ];
- description = "Library for parsing GHC time and allocation profiling reports";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "ghc-prof_1_4_1_4" = callPackage
({ mkDerivation, attoparsec, base, containers, directory, filepath
, process, scientific, tasty, tasty-hunit, temporary, text, time
}:
@@ -83275,7 +82938,6 @@ self: {
];
description = "Library for parsing GHC time and allocation profiling reports";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghc-prof-aeson" = callPackage
@@ -84450,28 +84112,6 @@ self: {
}) {inherit (pkgs.gst_all_1) gst-plugins-base;};
"gi-gtk" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
- , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
- , gi-pango, gtk3, haskell-gi, haskell-gi-base
- , haskell-gi-overloading, text, transformers
- }:
- mkDerivation {
- pname = "gi-gtk";
- version = "3.0.24";
- sha256 = "14cyj1acxs39avciyzqqb1qa5dr4my8rv3mfwv1kv92wa9a5i97v";
- setupHaskellDepends = [ base Cabal haskell-gi ];
- libraryHaskellDepends = [
- base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
- gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
- haskell-gi-overloading text transformers
- ];
- libraryPkgconfigDepends = [ gtk3 ];
- doHaddock = false;
- description = "Gtk bindings";
- license = stdenv.lib.licenses.lgpl21;
- }) {gtk3 = pkgs.gnome3.gtk;};
-
- "gi-gtk_3_0_25" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
, gi-pango, gtk3, haskell-gi, haskell-gi-base
@@ -84491,7 +84131,6 @@ self: {
doHaddock = false;
description = "Gtk bindings";
license = stdenv.lib.licenses.lgpl21;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
"gi-gtk-declarative" = callPackage
@@ -84530,23 +84169,6 @@ self: {
}) {};
"gi-gtk-hs" = callPackage
- ({ mkDerivation, base, base-compat, containers, gi-gdk
- , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
- , text, transformers
- }:
- mkDerivation {
- pname = "gi-gtk-hs";
- version = "0.3.6.1";
- sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw";
- libraryHaskellDepends = [
- base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
- gi-gtk haskell-gi-base mtl text transformers
- ];
- description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
- license = stdenv.lib.licenses.lgpl21;
- }) {};
-
- "gi-gtk-hs_0_3_6_2" = callPackage
({ mkDerivation, base, base-compat, containers, gi-gdk
, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
, text, transformers
@@ -84561,7 +84183,6 @@ self: {
];
description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
license = stdenv.lib.licenses.lgpl21;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gi-gtkosxapplication" = callPackage
@@ -84947,14 +84568,14 @@ self: {
"ginger" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , data-default, filepath, http-types, mtl, parsec, safe, scientific
- , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
- , unordered-containers, utf8-string, vector
+ , data-default, filepath, http-types, mtl, parsec, process, safe
+ , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unordered-containers, utf8-string, vector, yaml
}:
mkDerivation {
pname = "ginger";
- version = "0.7.3.0";
- sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs";
+ version = "0.8.0.1";
+ sha256 = "0ahd12y6qlnqi8wvhczn5hk2k7g48m6a0d2nxbvjx00iixs5dr34";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -84964,8 +84585,8 @@ self: {
unordered-containers utf8-string vector
];
executableHaskellDepends = [
- aeson base bytestring data-default text transformers
- unordered-containers
+ aeson base bytestring data-default process text transformers
+ unordered-containers yaml
];
testHaskellDepends = [
aeson base bytestring data-default mtl tasty tasty-hunit
@@ -85550,8 +85171,8 @@ self: {
}:
mkDerivation {
pname = "githash";
- version = "0.1.0.1";
- sha256 = "03zc7vjlnrr7ix7cnpgi70s0znsi07ms60dci8baxbcmjbibdcgy";
+ version = "0.1.1.0";
+ sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0";
libraryHaskellDepends = [
base bytestring directory filepath process template-haskell
];
@@ -90145,6 +89766,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "graphmod-plugin" = callPackage
+ ({ mkDerivation, base, containers, directory, dotgen, filepath, ghc
+ , syb, template-haskell
+ }:
+ mkDerivation {
+ pname = "graphmod-plugin";
+ version = "0.1.0.0";
+ sha256 = "0p95zr37mkvh7gsyj7wkzc3lqqbbkz7jh33jg123hz6qili2hziw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory dotgen filepath ghc syb template-haskell
+ ];
+ executableHaskellDepends = [ base ];
+ description = "A reimplementation of graphmod as a source plugin";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"graphql" = callPackage
({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }:
mkDerivation {
@@ -90541,28 +90180,6 @@ self: {
}) {};
"greskell-websocket" = callPackage
- ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
- , greskell-core, hashtables, hspec, safe-exceptions, stm, text
- , unordered-containers, uuid, vector, websockets
- }:
- mkDerivation {
- pname = "greskell-websocket";
- version = "0.1.1.0";
- sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13";
- libraryHaskellDepends = [
- aeson async base base64-bytestring bytestring greskell-core
- hashtables safe-exceptions stm text unordered-containers uuid
- vector websockets
- ];
- testHaskellDepends = [
- aeson base bytestring greskell-core hspec unordered-containers uuid
- vector
- ];
- description = "Haskell client for Gremlin Server using WebSocket serializer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "greskell-websocket_0_1_1_1" = callPackage
({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
, greskell-core, hashtables, hspec, safe-exceptions, stm, text
, unordered-containers, uuid, vector, websockets
@@ -90582,7 +90199,6 @@ self: {
];
description = "Haskell client for Gremlin Server using WebSocket serializer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"grid" = callPackage
@@ -91471,6 +91087,8 @@ self: {
pname = "gtk2hs-buildtools";
version = "0.13.4.0";
sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg";
+ revision = "1";
+ editedCabalFile = "0nbghg11y4nvxjxrvdm4a7fzj8z12fr12hkj4b7p27imlryg3m10";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -94073,43 +93691,6 @@ self: {
}) {};
"hakyll" = callPackage
- ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
- , containers, cryptohash, data-default, deepseq, directory
- , file-embed, filepath, fsnotify, http-conduit, http-types
- , lrucache, mtl, network-uri, optparse-applicative, pandoc
- , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
- , resourcet, scientific, tagsoup, tasty, tasty-hunit
- , tasty-quickcheck, text, time, time-locale-compat
- , unordered-containers, utillinux, vector, wai, wai-app-static
- , warp, yaml
- }:
- mkDerivation {
- pname = "hakyll";
- version = "4.12.3.0";
- sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base binary blaze-html blaze-markup bytestring containers
- cryptohash data-default deepseq directory file-embed filepath
- fsnotify http-conduit http-types lrucache mtl network-uri
- optparse-applicative pandoc pandoc-citeproc parsec process random
- regex-tdfa resourcet scientific tagsoup text time
- time-locale-compat unordered-containers vector wai wai-app-static
- warp yaml
- ];
- executableHaskellDepends = [ base directory filepath ];
- testHaskellDepends = [
- base bytestring containers filepath QuickCheck tasty tasty-hunit
- tasty-quickcheck text unordered-containers yaml
- ];
- testToolDepends = [ utillinux ];
- description = "A static website compiler library";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) utillinux;};
-
- "hakyll_4_12_4_0" = callPackage
({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
, containers, cryptohash, data-default, deepseq, directory
, file-embed, filepath, fsnotify, http-conduit, http-types
@@ -94144,7 +93725,6 @@ self: {
testToolDepends = [ utillinux ];
description = "A static website compiler library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) utillinux;};
"hakyll-R" = callPackage
@@ -95049,32 +94629,6 @@ self: {
}) {};
"hapistrano" = callPackage
- ({ mkDerivation, aeson, async, base, directory, filepath
- , formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.5.10";
- sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
- ];
- executableHaskellDepends = [
- aeson async base formatting gitrev optparse-applicative path
- path-io stm yaml
- ];
- testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
- ];
- description = "A deployment library for Haskell applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hapistrano_0_3_6_0" = callPackage
({ mkDerivation, aeson, async, base, directory, filepath
, formatting, gitrev, hspec, mtl, optparse-applicative, path
, path-io, process, stm, temporary, time, transformers, yaml
@@ -95098,7 +94652,6 @@ self: {
];
description = "A deployment library for Haskell applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"happindicator" = callPackage
@@ -97365,18 +96918,6 @@ self: {
inherit (pkgs.gnome3) gobjectIntrospection;};
"haskell-gi-base" = callPackage
- ({ mkDerivation, base, bytestring, containers, glib, text }:
- mkDerivation {
- pname = "haskell-gi-base";
- version = "0.21.1";
- sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36";
- libraryHaskellDepends = [ base bytestring containers text ];
- libraryPkgconfigDepends = [ glib ];
- description = "Foundation for libraries generated by haskell-gi";
- license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs) glib;};
-
- "haskell-gi-base_0_21_3" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
pname = "haskell-gi-base";
@@ -97386,7 +96927,6 @@ self: {
libraryPkgconfigDepends = [ glib ];
description = "Foundation for libraries generated by haskell-gi";
license = stdenv.lib.licenses.lgpl21;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) glib;};
"haskell-gi-overloading_0_0" = callPackage
@@ -97533,17 +97073,6 @@ self: {
}) {};
"haskell-lexer" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "haskell-lexer";
- version = "1.0.1";
- sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
- libraryHaskellDepends = [ base ];
- description = "A fully compliant Haskell 98 lexer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "haskell-lexer_1_0_2" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "haskell-lexer";
@@ -97552,7 +97081,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "A fully compliant Haskell 98 lexer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-lsp" = callPackage
@@ -98108,28 +97636,6 @@ self: {
}) {};
"haskell-src-exts" = callPackage
- ({ mkDerivation, array, base, containers, cpphs, directory
- , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
- , tasty, tasty-golden, tasty-smallcheck
- }:
- mkDerivation {
- pname = "haskell-src-exts";
- version = "1.20.2";
- sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
- revision = "1";
- editedCabalFile = "0gxpxs3p4qvky6m8g3fjj09hx7nkg28b9a4999ca7afz359si3r9";
- libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
- libraryToolDepends = [ happy ];
- testHaskellDepends = [
- base containers directory filepath mtl pretty-show smallcheck tasty
- tasty-golden tasty-smallcheck
- ];
- doCheck = false;
- description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "haskell-src-exts_1_20_3" = callPackage
({ mkDerivation, array, base, containers, directory, filepath
, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty
, tasty-golden, tasty-smallcheck
@@ -98147,7 +97653,6 @@ self: {
doCheck = false;
description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-src-exts-observe" = callPackage
@@ -100771,34 +100276,6 @@ self: {
}) {};
"haxl" = callPackage
- ({ mkDerivation, aeson, base, binary, bytestring, containers
- , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
- , stm, test-framework, test-framework-hunit, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "haxl";
- version = "2.0.1.0";
- sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
- revision = "1";
- editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base binary bytestring containers deepseq exceptions filepath
- ghc-prim hashable pretty stm text time transformers
- unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base binary bytestring containers deepseq filepath hashable
- HUnit test-framework test-framework-hunit text time
- unordered-containers
- ];
- description = "A Haskell library for efficient, concurrent, and concise data access";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "haxl_2_0_1_1" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, containers
, deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
, stm, test-framework, test-framework-hunit, text, time
@@ -100822,7 +100299,6 @@ self: {
];
description = "A Haskell library for efficient, concurrent, and concise data access";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haxl-amazonka" = callPackage
@@ -102141,32 +101617,6 @@ self: {
}) {};
"hedgehog" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, bytestring
- , concurrent-output, containers, directory, exceptions
- , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
- , random, resourcet, semigroups, stm, template-haskell, text
- , th-lift, time, transformers, transformers-base, unix
- , wl-pprint-annotated
- }:
- mkDerivation {
- pname = "hedgehog";
- version = "0.6";
- sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
- libraryHaskellDepends = [
- ansi-terminal async base bytestring concurrent-output containers
- directory exceptions lifted-async mmorph monad-control mtl
- pretty-show primitive random resourcet semigroups stm
- template-haskell text th-lift time transformers transformers-base
- unix wl-pprint-annotated
- ];
- testHaskellDepends = [
- base containers pretty-show semigroups text transformers
- ];
- description = "Hedgehog will eat all your bugs";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hedgehog_0_6_1" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring
, concurrent-output, containers, directory, exceptions
, lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
@@ -102192,7 +101642,6 @@ self: {
];
description = "Hedgehog will eat all your bugs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hedgehog-checkers" = callPackage
@@ -103315,6 +102764,53 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hevm" = callPackage
+ ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+ , base16-bytestring, base64-bytestring, binary, brick, bytestring
+ , cereal, containers, cryptonite, data-dword, deepseq, directory
+ , fgl, filepath, ghci-pretty, haskeline, here, HUnit, lens
+ , lens-aeson, megaparsec, memory, monad-par, mtl, multiset
+ , operational, optparse-generic, process, QuickCheck
+ , quickcheck-text, readline, regex-tdfa, restless-git, rosezipper
+ , s-cargot, scientific, secp256k1, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, text, text-format, time
+ , transformers, tree-view, unordered-containers, vector, vty, wreq
+ }:
+ mkDerivation {
+ pname = "hevm";
+ version = "0.16";
+ sha256 = "0i55jw3xcnh48r81jfs6k5ffckar2p85l67n3x6lkz12q8iq8vkn";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ abstract-par aeson ansi-wl-pprint base base16-bytestring
+ base64-bytestring binary brick bytestring cereal containers
+ cryptonite data-dword deepseq directory fgl filepath ghci-pretty
+ haskeline lens lens-aeson megaparsec memory monad-par mtl multiset
+ operational optparse-generic process QuickCheck quickcheck-text
+ readline restless-git rosezipper s-cargot scientific temporary text
+ text-format time transformers tree-view unordered-containers vector
+ vty wreq
+ ];
+ librarySystemDepends = [ secp256k1 ];
+ executableHaskellDepends = [
+ aeson ansi-wl-pprint async base base16-bytestring base64-bytestring
+ binary brick bytestring containers cryptonite data-dword deepseq
+ directory filepath ghci-pretty lens lens-aeson memory mtl
+ optparse-generic process QuickCheck quickcheck-text readline
+ regex-tdfa temporary text text-format unordered-containers vector
+ vty
+ ];
+ testHaskellDepends = [
+ base base16-bytestring binary bytestring ghci-pretty here HUnit
+ lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector
+ ];
+ testSystemDepends = [ secp256k1 ];
+ description = "Ethereum virtual machine evaluator";
+ license = stdenv.lib.licenses.agpl3;
+ }) {inherit (pkgs) secp256k1;};
+
"hevolisa" = callPackage
({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }:
mkDerivation {
@@ -104708,8 +104204,8 @@ self: {
pname = "hills";
version = "0.1.2.6";
sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
- revision = "1";
- editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9";
+ revision = "2";
+ editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -105593,12 +105089,12 @@ self: {
}:
mkDerivation {
pname = "hjsonpointer";
- version = "1.4.0";
- sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411";
- revision = "1";
- editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4";
+ version = "1.5.0";
+ sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y";
+ revision = "2";
+ editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi";
libraryHaskellDepends = [
- aeson base hashable QuickCheck text unordered-containers vector
+ aeson base hashable text unordered-containers vector
];
testHaskellDepends = [
aeson base hspec http-types QuickCheck text unordered-containers
@@ -105771,55 +105267,54 @@ self: {
"hledger" = callPackage
({ mkDerivation, ansi-terminal, base, base-compat-batteries
- , bytestring, cmdargs, containers, criterion, csv, data-default
- , Decimal, Diff, directory, file-embed, filepath, hashable
- , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl
+ , bytestring, cmdargs, containers, criterion, data-default, Decimal
+ , Diff, directory, easytest, file-embed, filepath, hashable
+ , haskeline, here, hledger-lib, html, lucid, megaparsec, mtl
, mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
- , safe, shakespeare, split, tabular, temporary, terminfo
- , test-framework, test-framework-hunit, text, time, timeit
- , transformers, unordered-containers, utf8-string, utility-ht
- , wizards
+ , safe, shakespeare, split, statistics, tabular, temporary
+ , terminfo, test-framework, test-framework-hunit, text, time
+ , timeit, transformers, unordered-containers, utf8-string
+ , utility-ht, wizards
}:
mkDerivation {
pname = "hledger";
- version = "1.10";
- sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
- revision = "1";
- editedCabalFile = "1kj1by80j7f6rzwfccwl2cp53bb3lyivh8a8xnawdyxab1pkyz34";
+ version = "1.11";
+ sha256 = "1kkgvyf4vrj5dy41v4z7xbyxhnw79y1j18d46pldim7iq43643ji";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal Diff directory file-embed
- filepath hashable haskeline here hledger-lib HUnit lucid megaparsec
- mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe
- shakespeare split tabular temporary terminfo text time transformers
- unordered-containers utf8-string utility-ht wizards
+ containers data-default Decimal Diff directory easytest file-embed
+ filepath hashable haskeline here hledger-lib lucid megaparsec mtl
+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
+ shakespeare split statistics tabular temporary terminfo text time
+ transformers unordered-containers utf8-string utility-ht wizards
];
executableHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal directory file-embed filepath
- haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
- parsec pretty-show process regex-tdfa safe shakespeare split
- tabular temporary terminfo text time transformers
+ containers data-default Decimal directory easytest file-embed
+ filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+ old-time parsec pretty-show process regex-tdfa safe shakespeare
+ split statistics tabular temporary terminfo text time transformers
unordered-containers utf8-string utility-ht wizards
];
testHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal directory file-embed filepath
- haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
- parsec pretty-show process regex-tdfa safe shakespeare split
- tabular temporary terminfo test-framework test-framework-hunit text
- time transformers unordered-containers utf8-string utility-ht
- wizards
+ containers data-default Decimal directory easytest file-embed
+ filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+ old-time parsec pretty-show process regex-tdfa safe shakespeare
+ split statistics tabular temporary terminfo test-framework
+ test-framework-hunit text time transformers unordered-containers
+ utf8-string utility-ht wizards
];
benchmarkHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers criterion csv data-default Decimal directory file-embed
- filepath haskeline here hledger-lib html HUnit megaparsec mtl
+ containers criterion data-default Decimal directory easytest
+ file-embed filepath haskeline here hledger-lib html megaparsec mtl
mtl-compat old-time parsec pretty-show process regex-tdfa safe
- shakespeare split tabular temporary terminfo text time timeit
- transformers unordered-containers utf8-string utility-ht wizards
+ shakespeare split statistics tabular temporary terminfo text time
+ timeit transformers unordered-containers utf8-string utility-ht
+ wizards
];
description = "Command-line interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
@@ -105834,8 +105329,8 @@ self: {
}:
mkDerivation {
pname = "hledger-api";
- version = "1.10";
- sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf";
+ version = "1.11";
+ sha256 = "1a59i6gn70mk124mmzfk4wz464a9r6hni0cd8c04fgp1v9zsa3m1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -105891,6 +105386,8 @@ self: {
pname = "hledger-iadd";
version = "1.3.6";
sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
+ revision = "1";
+ editedCabalFile = "067mrhg3m77ygv6cph5cxxcyd23acg9mq2fhpkl7714blc58z97v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105948,33 +105445,32 @@ self: {
"hledger-lib" = callPackage
({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
- , blaze-markup, bytestring, cmdargs, containers, csv, data-default
- , Decimal, deepseq, directory, doctest, easytest, extra, filepath
- , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time
- , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split
- , tabular, test-framework, test-framework-hunit, text, time
+ , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
+ , cmdargs, containers, data-default, Decimal, deepseq, directory
+ , doctest, easytest, extra, filepath, Glob, hashtables, megaparsec
+ , mtl, mtl-compat, old-time, parsec, parser-combinators
+ , pretty-show, regex-tdfa, safe, split, tabular, text, time
, transformers, uglymemo, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.10";
- sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1";
- revision = "1";
- editedCabalFile = "1b6hj4w1qfh1q8c3ikx5sn8z70cfdmqi4iy3a3l64q4x1j4jgyic";
+ version = "1.11";
+ sha256 = "0zh0y41cxz6skazfbqb1hw5sqy0kvdciib8d4xa0ny9rx4sjjq6a";
libraryHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
- bytestring cmdargs containers csv data-default Decimal deepseq
- directory extra filepath hashtables HUnit megaparsec mtl mtl-compat
- old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular text time transformers uglymemo utf8-string
+ bytestring call-stack cassava cassava-megaparsec cmdargs containers
+ data-default Decimal deepseq directory easytest extra filepath Glob
+ hashtables megaparsec mtl mtl-compat old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular text
+ time transformers uglymemo utf8-string
];
testHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
- bytestring cmdargs containers csv data-default Decimal deepseq
- directory doctest easytest extra filepath Glob hashtables HUnit
- megaparsec mtl mtl-compat old-time parsec parser-combinators
- pretty-show regex-tdfa safe split tabular test-framework
- test-framework-hunit text time transformers uglymemo utf8-string
+ bytestring call-stack cassava cassava-megaparsec cmdargs containers
+ data-default Decimal deepseq directory doctest easytest extra
+ filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular text
+ time transformers uglymemo utf8-string
];
description = "Core data types, parsers and functionality for the hledger accounting tools";
license = stdenv.lib.licenses.gpl3;
@@ -105983,24 +105479,21 @@ self: {
"hledger-ui" = callPackage
({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
, brick, cmdargs, containers, data-default, directory, filepath
- , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens
+ , fsnotify, hledger, hledger-lib, megaparsec, microlens
, microlens-platform, pretty-show, process, safe, split, text
, text-zipper, time, transformers, vector, vty
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.10.1";
- sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67";
- revision = "1";
- editedCabalFile = "1xvppxdkrk64mpqb64r016xshxqq25zzflbysmldgiqm1ibngy1g";
+ version = "1.11";
+ sha256 = "1szn9gx1s331axhg1m51s6v695skblx52fk0i0z03v2xkajn3y2r";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
ansi-terminal async base base-compat-batteries brick cmdargs
containers data-default directory filepath fsnotify hledger
- hledger-lib HUnit megaparsec microlens microlens-platform
- pretty-show process safe split text text-zipper time transformers
- vector vty
+ hledger-lib megaparsec microlens microlens-platform pretty-show
+ process safe split text text-zipper time transformers vector vty
];
description = "Curses-style user interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
@@ -106029,25 +105522,23 @@ self: {
({ mkDerivation, base, blaze-html, blaze-markup, bytestring
, case-insensitive, clientsession, cmdargs, conduit, conduit-extra
, data-default, directory, filepath, hjsmin, hledger, hledger-lib
- , http-client, http-conduit, HUnit, json, megaparsec, mtl
- , semigroups, shakespeare, template-haskell, text, time
- , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
- , yesod, yesod-core, yesod-form, yesod-static
+ , http-client, http-conduit, json, megaparsec, mtl, semigroups
+ , shakespeare, template-haskell, text, time, transformers, wai
+ , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
+ , yesod-form, yesod-static
}:
mkDerivation {
pname = "hledger-web";
- version = "1.10";
- sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9";
- revision = "1";
- editedCabalFile = "0zzgc6mjia06fwvjwpzzczh0p9k0a6bi2lib6zq5k1briq4gqblm";
+ version = "1.11";
+ sha256 = "0di7imrlpgldbk4hjv5l3b80v5n9qfyjajz9qgfpr0f1d54l0rdn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring case-insensitive
clientsession cmdargs conduit conduit-extra data-default directory
- filepath hjsmin hledger hledger-lib http-client http-conduit HUnit
- json megaparsec mtl semigroups shakespeare template-haskell text
- time transformers wai wai-extra wai-handler-launch warp yaml yesod
+ filepath hjsmin hledger hledger-lib http-client http-conduit json
+ megaparsec mtl semigroups shakespeare template-haskell text time
+ transformers wai wai-extra wai-handler-launch warp yaml yesod
yesod-core yesod-form yesod-static
];
executableHaskellDepends = [ base ];
@@ -106325,6 +105816,8 @@ self: {
pname = "hmatrix";
version = "0.19.0.0";
sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj";
+ revision = "1";
+ editedCabalFile = "0krx0ds5mcj28y6zpg0r50lljn8681wi4c5lqcdz2c71nhixfq8h";
configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
libraryHaskellDepends = [
array base binary bytestring deepseq random semigroups split
@@ -109550,28 +109043,6 @@ self: {
}) {};
"hruby" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
- , process, QuickCheck, ruby, scientific, stm, text
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "hruby";
- version = "0.3.5.4";
- sha256 = "17nm55xg6v71dp8cvaz9rp2siyywpynlxqxr1j44ciyw114h36vk";
- setupHaskellDepends = [ base Cabal process ];
- libraryHaskellDepends = [
- aeson attoparsec base bytestring scientific stm text
- unordered-containers vector
- ];
- librarySystemDepends = [ ruby ];
- testHaskellDepends = [
- aeson attoparsec base QuickCheck text vector
- ];
- description = "Embed a Ruby intepreter in your Haskell program !";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) ruby;};
-
- "hruby_0_3_6" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
, process, QuickCheck, ruby, scientific, stm, text
, unordered-containers, vector
@@ -109591,7 +109062,6 @@ self: {
];
description = "Embed a Ruby intepreter in your Haskell program !";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) ruby;};
"hs-GeoIP" = callPackage
@@ -111353,6 +110823,8 @@ self: {
pname = "hsexif";
version = "0.6.1.5";
sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig";
+ revision = "1";
+ editedCabalFile = "1q5ppjq8b08ljccg5680h1kklr288wfz52vnmgpcf9hqjm3icgvb";
libraryHaskellDepends = [
base binary bytestring containers iconv text time
];
@@ -111363,6 +110835,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hsexif_0_6_1_6" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+ , iconv, text, time
+ }:
+ mkDerivation {
+ pname = "hsexif";
+ version = "0.6.1.6";
+ sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg";
+ revision = "1";
+ editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9";
+ libraryHaskellDepends = [
+ base binary bytestring containers iconv text time
+ ];
+ testHaskellDepends = [
+ base binary bytestring containers hspec HUnit iconv text time
+ ];
+ description = "EXIF handling library in pure Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hsfacter" = callPackage
({ mkDerivation, base, containers, language-puppet, text }:
mkDerivation {
@@ -111624,23 +111117,6 @@ self: {
}) {};
"hslogger" = callPackage
- ({ mkDerivation, base, containers, directory, mtl, network
- , old-locale, process, time, unix
- }:
- mkDerivation {
- pname = "hslogger";
- version = "1.2.10";
- sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
- revision = "1";
- editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
- libraryHaskellDepends = [
- base containers directory mtl network old-locale process time unix
- ];
- description = "Versatile logging framework";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hslogger_1_2_12" = callPackage
({ mkDerivation, base, containers, directory, mtl, network
, old-locale, process, time, unix
}:
@@ -111653,7 +111129,6 @@ self: {
];
description = "Versatile logging framework";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hslogger-reader" = callPackage
@@ -111747,15 +111222,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) lua5_3;};
- "hslua_1_0_0" = callPackage
+ "hslua_1_0_1" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, deepseq
, exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
, tasty, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "hslua";
- version = "1.0.0";
- sha256 = "0xd47h1f2y3k6qrhbadiczx58ykcsm66hbkwd022r6hd2hfqk34c";
+ version = "1.0.1";
+ sha256 = "185izqlvxn406y6frhjr4sk3lq2hcmfm11hyyrxqf5v9pnxp8kna";
configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
libraryHaskellDepends = [
base bytestring containers exceptions fail mtl text
@@ -112152,8 +111627,8 @@ self: {
}:
mkDerivation {
pname = "hsparql";
- version = "0.3.5";
- sha256 = "0557c81wgk930x2bq72f2f3kycanxxvk1s5nrfxn56lmgijzkkqz";
+ version = "0.3.6";
+ sha256 = "0hx1mwdww6i88g497i26qdg0dhw2a41qclvpgwq7rl2m5wshm9qp";
libraryHaskellDepends = [
base bytestring HTTP MissingH mtl network network-uri rdf4h text
xml
@@ -112230,14 +111705,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec_2_5_7" = callPackage
+ "hspec_2_5_8" = callPackage
({ mkDerivation, base, hspec-core, hspec-discover
, hspec-expectations, QuickCheck
}:
mkDerivation {
pname = "hspec";
- version = "2.5.7";
- sha256 = "1bbxj0bxxhwkzvxg31a8gjyan1px3kx9md4j0ba177g3mk2fnxxy";
+ version = "2.5.8";
+ sha256 = "061k4r1jlzcnl0mzvk5nvamw1bx36rs2a38958m2hlh2mmfnfnsr";
libraryHaskellDepends = [
base hspec-core hspec-discover hspec-expectations QuickCheck
];
@@ -112345,7 +111820,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-core_2_5_7" = callPackage
+ "hspec-core_2_5_8" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, hspec-meta
, HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112353,8 +111828,8 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.5.7";
- sha256 = "0rlrc8q92jq3r6qf3bmyy8llz0dv9sdp0n169ni803wzlshaixsn";
+ version = "2.5.8";
+ sha256 = "08y6rhzc2vwmrxzl3bc8iwklkhgzv7x90mf9fnjnddlyaj7wcjg5";
libraryHaskellDepends = [
ansi-terminal array base call-stack clock deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112379,8 +111854,8 @@ self: {
}:
mkDerivation {
pname = "hspec-dirstream";
- version = "1.0.0.0";
- sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf";
+ version = "1.0.0.1";
+ sha256 = "17ac54ac21a5r954zvwxvn1j049q49m4ia7ghmdrcp94q3aczf4n";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -112428,13 +111903,13 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hspec-discover_2_5_7" = callPackage
+ "hspec-discover_2_5_8" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
}:
mkDerivation {
pname = "hspec-discover";
- version = "2.5.7";
- sha256 = "042v6wmxw7dwak6wgr02af1majq6qr5migrp360cm3frjfkw22cx";
+ version = "2.5.8";
+ sha256 = "001i0ldxi88qcww2hh3mkdr6svw4kj23lf65camk9bgn5zwvq5aj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -112763,8 +112238,8 @@ self: {
}:
mkDerivation {
pname = "hspec-need-env";
- version = "0.1.0.0";
- sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+ version = "0.1.0.1";
+ sha256 = "1n364lzmiyb27wl88z8g0kpgsgcxa2hp45w1qxzasl2im4q8adv5";
libraryHaskellDepends = [ base hspec-core hspec-expectations ];
testHaskellDepends = [ base hspec hspec-core setenv transformers ];
description = "Read environment variables for hspec tests";
@@ -115348,24 +114823,6 @@ self: {
}) {};
"http-types" = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
- , hspec, QuickCheck, quickcheck-instances, text
- }:
- mkDerivation {
- pname = "http-types";
- version = "0.12.1";
- sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
- libraryHaskellDepends = [
- array base bytestring case-insensitive text
- ];
- testHaskellDepends = [
- base bytestring doctest hspec QuickCheck quickcheck-instances text
- ];
- description = "Generic HTTP types for Haskell (for both client and server code)";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http-types_0_12_2" = callPackage
({ mkDerivation, array, base, bytestring, case-insensitive, doctest
, hspec, QuickCheck, quickcheck-instances, text
}:
@@ -115381,7 +114838,6 @@ self: {
];
description = "Generic HTTP types for Haskell (for both client and server code)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-wget" = callPackage
@@ -115434,6 +114890,8 @@ self: {
pname = "http2-client";
version = "0.8.0.1";
sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
+ revision = "1";
+ editedCabalFile = "190dhnj34b9xnpf6d3lj5a1fr90k2dy1l1i8505mp49lxzdvzkgc";
libraryHaskellDepends = [
async base bytestring containers deepseq http2 network stm time tls
];
@@ -116267,6 +115725,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hw-conduit-merges" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
+ , mtl, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hw-conduit-merges";
+ version = "0.2.0.0";
+ sha256 = "1302b2dsvv8yazvq5vz9cs2fbqvdsh6zyprijb41g881riqa5klv";
+ revision = "1";
+ editedCabalFile = "1azji7zc0ygqjgd2shbqw7p8a2ll2qp3b1yq5i3665448brlwpvc";
+ libraryHaskellDepends = [ base conduit conduit-extra mtl ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-extra hspec mtl QuickCheck
+ ];
+ description = "Additional merges and joins for Conduit";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-diagnostics" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -116473,8 +115949,8 @@ self: {
pname = "hw-json";
version = "0.6.0.0";
sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv";
- revision = "1";
- editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771";
+ revision = "2";
+ editedCabalFile = "0ygq95nx4sb70l5kfxlsj6rf2b3ry84ixby567n0jk1g0zks3z7s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116691,29 +116167,6 @@ self: {
}) {};
"hw-prim" = callPackage
- ({ mkDerivation, base, bytestring, criterion, directory, exceptions
- , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
- , transformers, vector
- }:
- mkDerivation {
- pname = "hw-prim";
- version = "0.6.2.15";
- sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc";
- libraryHaskellDepends = [
- base bytestring mmap semigroups transformers vector
- ];
- testHaskellDepends = [
- base bytestring directory exceptions hedgehog hspec
- hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion mmap semigroups transformers vector
- ];
- description = "Primitive functions and data types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hw-prim_0_6_2_17" = callPackage
({ mkDerivation, base, bytestring, criterion, directory, exceptions
, hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
, transformers, vector
@@ -116734,7 +116187,6 @@ self: {
];
description = "Primitive functions and data types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-prim-bits" = callPackage
@@ -118065,6 +117517,8 @@ self: {
pname = "hyraxAbif";
version = "0.2.3.10";
sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
+ revision = "1";
+ editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118196,8 +117650,8 @@ self: {
}:
mkDerivation {
pname = "iCalendar";
- version = "0.4.0.4";
- sha256 = "1hgji4riaqjpsqi2c7i1md9p8ig4sfigmldllnpkwbbhwhzmnsq5";
+ version = "0.4.0.5";
+ sha256 = "1s1pnwbp6bnsyswrw4vz8hr33jrfd4xs8vnpvrh57a75jdskgsn0";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive containers
data-default mime mtl network network-uri old-locale parsec text
@@ -120114,8 +119568,8 @@ self: {
}:
mkDerivation {
pname = "indexation";
- version = "0.6.4";
- sha256 = "1lm5ahr57lhwnfvz7kawl211chs4wjkykyicrrg748g4f03sm5a2";
+ version = "0.6.4.1";
+ sha256 = "04xywlx0xngbycc77x14nfvjb8z0q7mmyab75l8z223fj1fh3c21";
libraryHaskellDepends = [
base bitvec bytestring cereal cereal-vector contravariant deepseq
deferred-folds dense-int-set focus foldl hashable list-t mmorph
@@ -121919,8 +121373,8 @@ self: {
pname = "io-string-like";
version = "0.1.0.1";
sha256 = "0p8p4xp9qj7h1xa9dyizqpr85j8qjiccj3y9kplbskaqazl9pyqp";
- revision = "1";
- editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6";
+ revision = "2";
+ editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6";
libraryHaskellDepends = [ base binary bytestring text ];
description = "Classes to handle Prelude style IO functions for different datatypes";
license = stdenv.lib.licenses.bsd3;
@@ -122307,26 +121761,6 @@ self: {
}) {};
"irc-client" = callPackage
- ({ mkDerivation, base, bytestring, conduit, connection, containers
- , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
- , network-conduit-tls, old-locale, profunctors, stm, stm-chans
- , text, time, tls, transformers, x509, x509-store, x509-validation
- }:
- mkDerivation {
- pname = "irc-client";
- version = "1.1.0.4";
- sha256 = "1ag1rmsk53v3j5r0raipfc6w9mfc21w92gbanjfdl5nzsr4fzh87";
- libraryHaskellDepends = [
- base bytestring conduit connection containers contravariant
- exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
- profunctors stm stm-chans text time tls transformers x509
- x509-store x509-validation
- ];
- description = "An IRC client library";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "irc-client_1_1_0_5" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, containers
, contravariant, exceptions, irc-conduit, irc-ctcp, mtl
, network-conduit-tls, old-locale, profunctors, stm, stm-chans
@@ -122344,7 +121778,6 @@ self: {
];
description = "An IRC client library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"irc-colors" = callPackage
@@ -123437,6 +122870,8 @@ self: {
pname = "ixset-typed";
version = "0.4";
sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
+ revision = "1";
+ editedCabalFile = "1ldf6bkm085idwp8a8ppxvyawii4gbhyw1pwrcyi3n8jpjh8hqcq";
libraryHaskellDepends = [
base containers deepseq safecopy syb template-haskell
];
@@ -123447,6 +122882,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ixset-typed_0_4_0_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
+ , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "ixset-typed";
+ version = "0.4.0.1";
+ sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8";
+ libraryHaskellDepends = [
+ base containers deepseq safecopy syb template-haskell
+ ];
+ testHaskellDepends = [
+ base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Efficient relational queries on Haskell sets";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ixshader" = callPackage
({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec
, prettyclass, singletons, template-haskell, text
@@ -126328,8 +125783,10 @@ self: {
}:
mkDerivation {
pname = "katip";
- version = "0.6.0.0";
- sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3";
+ version = "0.6.1.0";
+ sha256 = "0mqx1dvq5v18sd2rqr2zlvmznj84vwml8zdf0hlhviw7kl9wjbah";
+ revision = "1";
+ editedCabalFile = "1znlk9jkrp3hl1frra563c61p49sp56nw1xps593w2qq9hr037rq";
libraryHaskellDepends = [
aeson async auto-update base bytestring containers either hostname
microlens microlens-th monad-control mtl old-locale resourcet
@@ -126361,8 +125818,8 @@ self: {
}:
mkDerivation {
pname = "katip-elasticsearch";
- version = "0.5.0.0";
- sha256 = "1wvsk4lnkjpi38z7f9w8dafsw0cc1cgi8q2fsrqc0f7xv1qgzjb3";
+ version = "0.5.1.0";
+ sha256 = "0nl88srx0w7i7h14g97qxki91vbwg2ibkcqd4v39a7l7j0rzw0vh";
libraryHaskellDepends = [
aeson async base bloodhound bytestring enclosed-exceptions
exceptions http-client http-types katip retry scientific semigroups
@@ -128898,26 +128355,6 @@ self: {
}) {};
"language-c" = callPackage
- ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
- , directory, filepath, happy, pretty, process, syb
- }:
- mkDerivation {
- pname = "language-c";
- version = "0.8.1";
- sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
- revision = "2";
- editedCabalFile = "08h8a747k68nbv2mmbjlq2y2pqs738v8z54glrrh94963b2bh4h1";
- libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath pretty
- process syb
- ];
- libraryToolDepends = [ alex happy ];
- testHaskellDepends = [ base directory filepath process ];
- description = "Analysis and generation of C code";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "language-c_0_8_2" = callPackage
({ mkDerivation, alex, array, base, bytestring, containers, deepseq
, directory, filepath, happy, pretty, process, syb
}:
@@ -128935,7 +128372,6 @@ self: {
testHaskellDepends = [ base directory filepath process ];
description = "Analysis and generation of C code";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-c-comments" = callPackage
@@ -129312,6 +128748,8 @@ self: {
pname = "language-java";
version = "0.2.9";
sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x";
+ revision = "1";
+ editedCabalFile = "0fnbg9b8isyk8dpmggh736mms7a2m65956y1z15wds63imzhs2ik";
libraryHaskellDepends = [ array base parsec pretty ];
libraryToolDepends = [ alex ];
testHaskellDepends = [
@@ -130757,18 +130195,6 @@ self: {
}) {};
"leancheck" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "leancheck";
- version = "0.7.4";
- sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq";
- libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [ base ];
- description = "Enumerative property-based testing";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "leancheck_0_7_5" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
@@ -130778,7 +130204,6 @@ self: {
testHaskellDepends = [ base ];
description = "Enumerative property-based testing";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"leankit-api" = callPackage
@@ -131243,21 +130668,6 @@ self: {
}) {};
"lens-family" = callPackage
- ({ mkDerivation, base, containers, lens-family-core, mtl
- , transformers
- }:
- mkDerivation {
- pname = "lens-family";
- version = "1.2.2";
- sha256 = "0fs34wdhmfln06dnmgnbzgjiib6yb6z4ybcxqibal3amg7jlv8nx";
- libraryHaskellDepends = [
- base containers lens-family-core mtl transformers
- ];
- description = "Lens Families";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "lens-family_1_2_3" = callPackage
({ mkDerivation, base, containers, lens-family-core, mtl
, transformers
}:
@@ -131270,21 +130680,9 @@ self: {
];
description = "Lens Families";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lens-family-core" = callPackage
- ({ mkDerivation, base, containers, transformers }:
- mkDerivation {
- pname = "lens-family-core";
- version = "1.2.2";
- sha256 = "0a26rbgwq9z7lp52zkvwz13sjd35hr06xxc6zz4sglpjc4dqkzlm";
- libraryHaskellDepends = [ base containers transformers ];
- description = "Haskell 98 Lens Families";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "lens-family-core_1_2_3" = callPackage
({ mkDerivation, base, containers, transformers }:
mkDerivation {
pname = "lens-family-core";
@@ -131293,7 +130691,6 @@ self: {
libraryHaskellDepends = [ base containers transformers ];
description = "Haskell 98 Lens Families";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lens-family-th" = callPackage
@@ -132711,27 +132108,6 @@ self: {
}) {};
"lifted-async" = callPackage
- ({ mkDerivation, async, base, constraints, criterion, deepseq
- , HUnit, lifted-base, monad-control, mtl, tasty
- , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
- }:
- mkDerivation {
- pname = "lifted-async";
- version = "0.10.0.2";
- sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
- libraryHaskellDepends = [
- async base constraints lifted-base monad-control transformers-base
- ];
- testHaskellDepends = [
- async base HUnit lifted-base monad-control mtl tasty
- tasty-expected-failure tasty-hunit tasty-th
- ];
- benchmarkHaskellDepends = [ async base criterion deepseq ];
- description = "Run lifted IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "lifted-async_0_10_0_3" = callPackage
({ mkDerivation, async, base, constraints, criterion, deepseq
, HUnit, lifted-base, monad-control, mtl, tasty
, tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
@@ -132750,7 +132126,6 @@ self: {
benchmarkHaskellDepends = [ async base criterion deepseq ];
description = "Run lifted IO operations asynchronously and wait for their results";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lifted-base" = callPackage
@@ -133294,17 +132669,12 @@ self: {
}) {};
"linear-socket" = callPackage
- ({ mkDerivation, base, bytestring, hlint, hspec, network
- , tasty-hspec
- }:
+ ({ mkDerivation, base, bytestring, hspec, network, tasty-hspec }:
mkDerivation {
pname = "linear-socket";
- version = "0.3.3.2";
- sha256 = "1a3ddpay2wyl5bwlnysx037ca0x0bh93ingxl6c2wlxab351zm4h";
- isLibrary = true;
- isExecutable = true;
+ version = "0.3.3.3";
+ sha256 = "0bi2idqny1y5d63xhryxl085plc7w3ybk6fgj9xsp6scyxdx8p82";
libraryHaskellDepends = [ base bytestring network ];
- executableHaskellDepends = [ base hlint ];
testHaskellDepends = [ base hspec network tasty-hspec ];
description = "Typed sockets";
license = stdenv.lib.licenses.gpl3;
@@ -134551,6 +133921,8 @@ self: {
pname = "llvm-extra";
version = "0.7.3";
sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a";
+ revision = "1";
+ editedCabalFile = "1zsmfzhlcxcn24z3k21lkk3wmb6rw1mnsky2q85kj6xam92lyn73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134677,8 +134049,35 @@ self: {
pname = "llvm-hs";
version = "6.3.0";
sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd";
- revision = "1";
- editedCabalFile = "01kmqdma80qzfpzikny0xm69q0ikv5fy3kw4p6mpg15kkypwmcpg";
+ revision = "2";
+ editedCabalFile = "08rm1y7icxp2bdmv65n5nxg5mkppqpqd3m62n50gk6991kki9qdf";
+ setupHaskellDepends = [ base Cabal containers ];
+ libraryHaskellDepends = [
+ array attoparsec base bytestring containers exceptions llvm-hs-pure
+ mtl template-haskell transformers utf8-string
+ ];
+ libraryToolDepends = [ llvm-config ];
+ testHaskellDepends = [
+ base bytestring containers llvm-hs-pure mtl pretty-show process
+ QuickCheck tasty tasty-hunit tasty-quickcheck temporary
+ transformers
+ ];
+ description = "General purpose LLVM bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {llvm-config = null;};
+
+ "llvm-hs_7_0_1" = callPackage
+ ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+ , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+ , pretty-show, process, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, transformers
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "llvm-hs";
+ version = "7.0.1";
+ sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy";
setupHaskellDepends = [ base Cabal containers ];
libraryHaskellDepends = [
array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134736,6 +134135,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "llvm-hs-pure_7_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, fail
+ , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "llvm-hs-pure";
+ version = "7.0.0";
+ sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers fail mtl template-haskell
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers mtl tasty tasty-hunit tasty-quickcheck transformers
+ ];
+ description = "Pure Haskell LLVM functionality (no FFI)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"llvm-ht" = callPackage
({ mkDerivation, base, bytestring, directory, mtl, process
, type-level
@@ -135315,8 +134735,8 @@ self: {
}:
mkDerivation {
pname = "log-effect";
- version = "1.1.0";
- sha256 = "1x3mj0gcpclv9by51rd1bi1ccaas0cy8yv1g6i08r64hj8jyhlk3";
+ version = "1.1.1";
+ sha256 = "10fd3xnkybca8pi7nw2hq1ggk5g89z8b2ml3avqi1x91chqdqi85";
libraryHaskellDepends = [
base bytestring extensible-effects monad-control text
transformers-base
@@ -135567,6 +134987,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "logging-effect_1_3_3" = callPackage
+ ({ mkDerivation, async, base, bytestring, criterion, exceptions
+ , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+ , prettyprinter, semigroups, stm, stm-delay, text, time
+ , transformers, transformers-base, unliftio-core
+ }:
+ mkDerivation {
+ pname = "logging-effect";
+ version = "1.3.3";
+ sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr";
+ libraryHaskellDepends = [
+ async base exceptions free monad-control mtl prettyprinter
+ semigroups stm stm-delay text time transformers transformers-base
+ unliftio-core
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion fast-logger lifted-async monad-logger
+ prettyprinter text time
+ ];
+ description = "A mtl-style monad transformer for general purpose & compositional logging";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"logging-effect-extra" = callPackage
({ mkDerivation, base, logging-effect, logging-effect-extra-file
, logging-effect-extra-handler, prettyprinter
@@ -138650,29 +138094,6 @@ self: {
}) {};
"markdown" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
- , call-stack, conduit, conduit-extra, containers, data-default
- , directory, filepath, hspec, text, transformers, xml-conduit
- , xml-types, xss-sanitize
- }:
- mkDerivation {
- pname = "markdown";
- version = "0.1.17.1";
- sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1";
- libraryHaskellDepends = [
- attoparsec base blaze-html blaze-markup conduit conduit-extra
- containers data-default text transformers xml-conduit xml-types
- xss-sanitize
- ];
- testHaskellDepends = [
- base blaze-html call-stack conduit conduit-extra containers
- directory filepath hspec text transformers
- ];
- description = "Convert Markdown to HTML, with XSS protection";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "markdown_0_1_17_4" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
, bytestring, call-stack, conduit, conduit-extra, containers
, data-default, directory, filepath, hspec, text, transformers
@@ -138693,7 +138114,6 @@ self: {
];
description = "Convert Markdown to HTML, with XSS protection";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"markdown-kate" = callPackage
@@ -139038,24 +138458,6 @@ self: {
}) {};
"massiv" = callPackage
- ({ mkDerivation, base, data-default, data-default-class, deepseq
- , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
- }:
- mkDerivation {
- pname = "massiv";
- version = "0.2.0.0";
- sha256 = "0jyripzh4da29bvbhrfmwvjicr22ll9vbd0f3wiv4gcmlpnhls9j";
- libraryHaskellDepends = [
- base data-default-class deepseq ghc-prim primitive vector
- ];
- testHaskellDepends = [
- base data-default deepseq hspec QuickCheck safe-exceptions vector
- ];
- description = "Massiv (Массив) is an Array Library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "massiv_0_2_1_0" = callPackage
({ mkDerivation, base, bytestring, data-default, data-default-class
, deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
, vector
@@ -139074,7 +138476,6 @@ self: {
];
description = "Massiv (Массив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"massiv-io" = callPackage
@@ -140720,6 +140121,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "memory_0_14_18" = callPackage
+ ({ mkDerivation, base, basement, bytestring, deepseq, foundation
+ , ghc-prim
+ }:
+ mkDerivation {
+ pname = "memory";
+ version = "0.14.18";
+ sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
+ revision = "1";
+ editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm";
+ libraryHaskellDepends = [
+ base basement bytestring deepseq ghc-prim
+ ];
+ testHaskellDepends = [ base basement bytestring foundation ];
+ description = "memory and related abstraction stuff";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"memorypool" = callPackage
({ mkDerivation, base, containers, transformers, unsafe, vector }:
mkDerivation {
@@ -141385,6 +140805,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-contra_0_1_0_2" = callPackage
+ ({ mkDerivation, base, contravariant, microlens }:
+ mkDerivation {
+ pname = "microlens-contra";
+ version = "0.1.0.2";
+ sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
+ libraryHaskellDepends = [ base contravariant microlens ];
+ description = "True folds and getters for microlens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-each" = callPackage
({ mkDerivation, base, microlens }:
mkDerivation {
@@ -141449,8 +140881,8 @@ self: {
}:
mkDerivation {
pname = "microlens-th";
- version = "0.4.2.2";
- sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05";
+ version = "0.4.2.3";
+ sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
libraryHaskellDepends = [
base containers microlens template-haskell th-abstraction
transformers
@@ -142641,6 +142073,8 @@ self: {
pname = "mmark";
version = "0.0.6.0";
sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv";
+ revision = "1";
+ editedCabalFile = "0z9r6xjg6qpp2ai1wzkn0cvjw8dv6s94awsys6968ixmdzz9vrbz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers data-default-class deepseq
@@ -144947,12 +144381,12 @@ self: {
}) {};
"monopati" = callPackage
- ({ mkDerivation, base, comonad, directory, free, split }:
+ ({ mkDerivation, base, free, split }:
mkDerivation {
pname = "monopati";
- version = "0.1.0";
- sha256 = "18bx5xy3d3mk47499anrl1xlmxb8g3l35ibyllkcqhsx822zk9ij";
- libraryHaskellDepends = [ base comonad directory free split ];
+ version = "0.1.1";
+ sha256 = "0zpqhxq9vq7svkdrn8aph5i1f8kd9l8jgdg8lpj15c311qrz8cl5";
+ libraryHaskellDepends = [ base free split ];
description = "Well-typed paths";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -145266,6 +144700,46 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "moto" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath
+ , mtl, optparse-applicative, pipes, pipes-attoparsec
+ , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit
+ , tasty-quickcheck, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "moto";
+ version = "0.0.3";
+ sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers cryptohash-sha1 df1
+ di-core di-df1 directory filepath mtl optparse-applicative pipes
+ pipes-attoparsec pipes-bytestring safe-exceptions text time
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers di di-core directory filepath random
+ safe-exceptions tasty tasty-hunit tasty-quickcheck text time
+ ];
+ description = "General purpose migrations library";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "moto-postgresql" = callPackage
+ ({ mkDerivation, base, bytestring, moto, postgresql-simple
+ , safe-exceptions
+ }:
+ mkDerivation {
+ pname = "moto-postgresql";
+ version = "0.0.1";
+ sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d";
+ libraryHaskellDepends = [
+ base bytestring moto postgresql-simple safe-exceptions
+ ];
+ description = "PostgreSQL-based migrations registry for moto";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"motor" = callPackage
({ mkDerivation, base, indexed, indexed-extras, reflection
, row-types, template-haskell
@@ -146554,8 +146028,8 @@ self: {
pname = "multistate";
version = "0.8.0.0";
sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
- revision = "2";
- editedCabalFile = "1dp52gacm8ql3g7xvb1dzp3migwpz2kcnz8pafbf7rs1lmccj1zf";
+ revision = "3";
+ editedCabalFile = "0gi4l3765jgsvhr6jj2q1l7v6188kg2xw4zwcaarq3hcg1ncaakw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148402,6 +147876,8 @@ self: {
pname = "natural";
version = "0.3.0.2";
sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+ revision = "1";
+ editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
libraryHaskellDepends = [ base lens semigroupoids ];
testHaskellDepends = [
base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -149632,8 +149108,8 @@ self: {
({ mkDerivation, base, bytestring, network, text, time, vector }:
mkDerivation {
pname = "network-carbon";
- version = "1.0.12";
- sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd";
+ version = "1.0.13";
+ sha256 = "06cc62fns07flmsl9gbdicmqqg5icmy3m4n0nvp2xqjk1ax8ws39";
libraryHaskellDepends = [
base bytestring network text time vector
];
@@ -150049,21 +149525,6 @@ self: {
}) {};
"network-simple" = callPackage
- ({ mkDerivation, base, bytestring, exceptions, network
- , safe-exceptions, transformers
- }:
- mkDerivation {
- pname = "network-simple";
- version = "0.4.2";
- sha256 = "0h3xq0lv9wqczm93m81irqsirwsrw9jip11rxyghxrk4rf6pg4ip";
- libraryHaskellDepends = [
- base bytestring exceptions network safe-exceptions transformers
- ];
- description = "Simple network sockets usage patterns";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "network-simple_0_4_3" = callPackage
({ mkDerivation, base, bytestring, network, safe-exceptions, socks
, transformers
}:
@@ -150076,7 +149537,6 @@ self: {
];
description = "Simple network sockets usage patterns";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-simple-sockaddr" = callPackage
@@ -150096,23 +149556,6 @@ self: {
}) {};
"network-simple-tls" = callPackage
- ({ mkDerivation, base, bytestring, data-default, exceptions
- , network, network-simple, tls, transformers, x509, x509-store
- , x509-system, x509-validation
- }:
- mkDerivation {
- pname = "network-simple-tls";
- version = "0.3";
- sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
- libraryHaskellDepends = [
- base bytestring data-default exceptions network network-simple tls
- transformers x509 x509-store x509-system x509-validation
- ];
- description = "Simple interface to TLS secured network sockets";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "network-simple-tls_0_3_1" = callPackage
({ mkDerivation, base, bytestring, data-default, network
, network-simple, safe-exceptions, tls, transformers, x509
, x509-store, x509-system, x509-validation
@@ -150127,7 +149570,6 @@ self: {
];
description = "Simple interface to TLS secured network sockets";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-socket-options" = callPackage
@@ -151870,6 +151312,8 @@ self: {
pname = "nowdoc";
version = "0.1.1.0";
sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg";
+ revision = "1";
+ editedCabalFile = "074xgrxs8ynq29bsx66an03q0457f80ga9jf4sqi0q34jgfpmbcv";
libraryHaskellDepends = [ base bytestring template-haskell ];
testHaskellDepends = [ base bytestring template-haskell ];
description = "Here document without variable expansion like PHP Nowdoc";
@@ -152590,6 +152034,47 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "nvim-hs_1_0_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+ , containers, data-default, deepseq, directory, dyre, filepath
+ , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
+ , messagepack, mtl, network, optparse-applicative, prettyprinter
+ , prettyprinter-ansi-terminal, process, QuickCheck, resourcet
+ , setenv, stm, streaming-commons, template-haskell, text, time
+ , time-locale-compat, transformers, transformers-base, unliftio
+ , unliftio-core, utf8-string, void
+ }:
+ mkDerivation {
+ pname = "nvim-hs";
+ version = "1.0.0.3";
+ sha256 = "07pnabrb9hs2l8ajrzcs3wz1m9vfq88wqjirf84ygmmnnd8dva71";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cereal cereal-conduit conduit containers
+ data-default deepseq directory dyre filepath foreign-store hslogger
+ megaparsec messagepack mtl network optparse-applicative
+ prettyprinter prettyprinter-ansi-terminal process resourcet setenv
+ stm streaming-commons template-haskell text time time-locale-compat
+ transformers transformers-base unliftio unliftio-core utf8-string
+ void
+ ];
+ executableHaskellDepends = [ base data-default ];
+ testHaskellDepends = [
+ base bytestring cereal cereal-conduit conduit containers
+ data-default directory dyre filepath foreign-store hslogger hspec
+ hspec-discover HUnit megaparsec messagepack mtl network
+ optparse-applicative prettyprinter prettyprinter-ansi-terminal
+ process QuickCheck resourcet setenv stm streaming-commons
+ template-haskell text time time-locale-compat transformers
+ transformers-base unliftio unliftio-core utf8-string
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Haskell plugin backend for neovim";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"nvim-hs-contrib" = callPackage
({ mkDerivation, base, bytestring, data-default, directory
, filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs
@@ -152636,8 +152121,8 @@ self: {
}:
mkDerivation {
pname = "nvvm";
- version = "0.8.0.3";
- sha256 = "1kwmgl1bp0mlv4bdnjl6m1v34k68pgg6z00z3i7x3wfjff8gd5sr";
+ version = "0.9.0.0";
+ sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb";
setupHaskellDepends = [
base Cabal cuda directory filepath template-haskell
];
@@ -152707,6 +152192,32 @@ self: {
pname = "o-clock";
version = "1.0.0";
sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
+ revision = "1";
+ editedCabalFile = "0df6b78y05q8pmlxyfpln01vkm0r38cay1ffsbz1biyfs6s115j5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ghc-prim ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+ tasty-hspec type-spec
+ ];
+ testToolDepends = [ doctest markdown-unlit ];
+ benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
+ description = "Type-safe time library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "o-clock_1_0_0_1" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
+ , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
+ , tiempo, time-units, type-spec
+ }:
+ mkDerivation {
+ pname = "o-clock";
+ version = "1.0.0.1";
+ sha256 = "0nmv0zvhd2wd327q268xd8x9swb5v6pm5fn9p5zyn0khja38s6fr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ghc-prim ];
@@ -153100,35 +152611,6 @@ self: {
inherit (pkgs) systemd;};
"odbc" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, deepseq
- , formatting, hspec, optparse-applicative, parsec, QuickCheck
- , semigroups, template-haskell, text, time, transformers, unixODBC
- , unliftio-core, weigh
- }:
- mkDerivation {
- pname = "odbc";
- version = "0.2.0";
- sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async base bytestring containers deepseq formatting parsec
- semigroups template-haskell text time transformers unliftio-core
- ];
- librarySystemDepends = [ unixODBC ];
- executableHaskellDepends = [
- base bytestring optparse-applicative text
- ];
- testHaskellDepends = [
- base bytestring hspec parsec QuickCheck text time
- ];
- benchmarkHaskellDepends = [ async base text weigh ];
- description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) unixODBC;};
-
- "odbc_0_2_2" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, formatting, hspec, optparse-applicative, parsec, QuickCheck
, semigroups, template-haskell, text, time, transformers, unixODBC
@@ -153743,8 +153225,8 @@ self: {
pname = "opaleye";
version = "0.6.1.0";
sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
- revision = "1";
- editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f";
+ revision = "2";
+ editedCabalFile = "07yn6xzynvjz9p6mv9kzh1sz05dqqsmihznba8s9q36lixlslyag";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -156169,7 +155651,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_3" = callPackage
+ "pandoc_2_3_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
, binary, blaze-html, blaze-markup, bytestring, Cabal
, case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -156184,8 +155666,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "2.3";
- sha256 = "0wyf0rc8macczrql8v1802hdifzk5nbwxzv42kxfx55qnwdil1av";
+ version = "2.3.1";
+ sha256 = "1wf38mqny53ygpaii0vfjrk0889ya7mlsi7hvvqjakjndcyqflbl";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -156227,10 +155709,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.14.3.1";
- sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
- revision = "1";
- editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk";
+ version = "0.14.5";
+ sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -156254,41 +155734,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "pandoc-citeproc_0_14_4" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
- , Cabal, containers, data-default, directory, filepath, hs-bibutils
- , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
- , setenv, split, syb, tagsoup, temporary, text, time
- , unordered-containers, vector, xml-conduit, yaml
- }:
- mkDerivation {
- pname = "pandoc-citeproc";
- version = "0.14.4";
- sha256 = "00m81bwb0s0m7qm3b8xslwdyifdar2fzsnhjrxkqjlj8axdlb796";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [
- aeson base bytestring containers data-default directory filepath
- hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
- setenv split syb tagsoup text time unordered-containers vector
- xml-conduit yaml
- ];
- executableHaskellDepends = [
- aeson aeson-pretty attoparsec base bytestring filepath pandoc
- pandoc-types syb text yaml
- ];
- testHaskellDepends = [
- aeson base bytestring containers directory filepath mtl pandoc
- pandoc-types process temporary text yaml
- ];
- doCheck = false;
- description = "Supports using pandoc with citeproc";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -156520,6 +155965,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pandoc-pyplot" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath
+ , pandoc-types, temporary, typed-process
+ }:
+ mkDerivation {
+ pname = "pandoc-pyplot";
+ version = "1.0.0.0";
+ sha256 = "0dcrvzsg6h8pmrk1k3w12hsnh169n0ahlybpg8zhm4xbac5iafc7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filepath pandoc-types temporary
+ typed-process
+ ];
+ executableHaskellDepends = [ base pandoc-types ];
+ description = "A Pandoc filter for including figures generated from Matplotlib";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pandoc-sidenote" = callPackage
({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
mkDerivation {
@@ -157459,8 +156923,8 @@ self: {
}:
mkDerivation {
pname = "paripari";
- version = "0.4.0.0";
- sha256 = "10pg179pcrrwl321xw7q9wyfpfkaczavhlgrmv2nqd2yxwmkgqdb";
+ version = "0.5.0.0";
+ sha256 = "0wk0b7vb3y2gs1sayd0sh5wa643q5vvc6s2cq9p1h8paxkhd3ypb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -158025,8 +157489,8 @@ self: {
({ mkDerivation, base, doctest, hedgehog }:
mkDerivation {
pname = "partial-semigroup";
- version = "0.3.0.3";
- sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
+ version = "0.4.0.1";
+ sha256 = "0jfdybqxqrkxwbvscgy6q6vp32jp5h9xbyfykxbvsc64h02kn6gs";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest hedgehog ];
description = "A partial binary associative operator";
@@ -158038,8 +157502,8 @@ self: {
({ mkDerivation, base, hedgehog, partial-semigroup }:
mkDerivation {
pname = "partial-semigroup-hedgehog";
- version = "0.3.0.1";
- sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
+ version = "0.4.0.1";
+ sha256 = "1nvfy1cwp7qv77bm0ax3ll7jmqciasq9gsyyrghsx18y1q2d8qzp";
libraryHaskellDepends = [ base hedgehog partial-semigroup ];
description = "Property testing for partial semigroups using Hedgehog";
license = stdenv.lib.licenses.asl20;
@@ -158050,8 +157514,8 @@ self: {
({ mkDerivation, partial-semigroup-hedgehog }:
mkDerivation {
pname = "partial-semigroup-test";
- version = "0.3.0.1";
- sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n";
+ version = "0.4.0.1";
+ sha256 = "0p990b35wqy339mhlbcd0xh82rc4qyahzn4ndjyy1cv33cab7is7";
libraryHaskellDepends = [ partial-semigroup-hedgehog ];
doHaddock = false;
description = "Testing utilities for the partial-semigroup package";
@@ -161811,22 +161275,6 @@ self: {
}) {};
"pipes-concurrency" = callPackage
- ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
- , void
- }:
- mkDerivation {
- pname = "pipes-concurrency";
- version = "2.0.11";
- sha256 = "03h87b11c64yvj28lxgbvjvqrsx0zfqb92v0apd8ypb9xxabqd4m";
- libraryHaskellDepends = [
- async base contravariant pipes semigroups stm void
- ];
- testHaskellDepends = [ async base pipes stm ];
- description = "Concurrency for the pipes ecosystem";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pipes-concurrency_2_0_12" = callPackage
({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
, void
}:
@@ -161834,13 +161282,14 @@ self: {
pname = "pipes-concurrency";
version = "2.0.12";
sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
+ revision = "1";
+ editedCabalFile = "1c1rys2pp7a2z6si925ps610q8a38a6m26s182phwa5nfhyggpaw";
libraryHaskellDepends = [
async base contravariant pipes semigroups stm void
];
testHaskellDepends = [ async base pipes stm ];
description = "Concurrency for the pipes ecosystem";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-conduit" = callPackage
@@ -162390,8 +161839,8 @@ self: {
pname = "pipes-safe";
version = "2.2.9";
sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
- revision = "1";
- editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
+ revision = "2";
+ editedCabalFile = "1crpzg72nahmffw468d31l23bw3wgi0p3w7ad2pv3jxhy1432c71";
libraryHaskellDepends = [
base containers exceptions monad-control mtl pipes primitive
transformers transformers-base
@@ -162400,6 +161849,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes-safe_2_3_0" = callPackage
+ ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+ , pipes, primitive, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "pipes-safe";
+ version = "2.3.0";
+ sha256 = "1b8cx8drwnviq2fic2ppldf774awih4wd0m1an0iv2x3l7ndy9jp";
+ libraryHaskellDepends = [
+ base containers exceptions monad-control mtl pipes primitive
+ transformers transformers-base
+ ];
+ description = "Safety for the pipes ecosystem";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pipes-shell" = callPackage
({ mkDerivation, async, base, bytestring, directory, hspec, pipes
, pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@@ -164839,19 +164305,6 @@ self: {
}) {};
"postgresql-libpq" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
- mkDerivation {
- pname = "postgresql-libpq";
- version = "0.9.4.1";
- sha256 = "0ssn12cs643nd1bliaks0l0ssainydsrzjr3l5p7hm3wnqwa77qd";
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [ base bytestring unix ];
- librarySystemDepends = [ postgresql ];
- description = "low-level binding to libpq";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) postgresql;};
-
- "postgresql-libpq_0_9_4_2" = callPackage
({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
mkDerivation {
pname = "postgresql-libpq";
@@ -164863,7 +164316,6 @@ self: {
testHaskellDepends = [ base bytestring ];
description = "low-level binding to libpq";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) postgresql;};
"postgresql-named" = callPackage
@@ -165639,18 +165091,6 @@ self: {
}) {};
"pqueue" = callPackage
- ({ mkDerivation, base, deepseq, QuickCheck }:
- mkDerivation {
- pname = "pqueue";
- version = "1.4.1.1";
- sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x";
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base deepseq QuickCheck ];
- description = "Reliable, persistent, fast priority queues";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pqueue_1_4_1_2" = callPackage
({ mkDerivation, base, deepseq, QuickCheck }:
mkDerivation {
pname = "pqueue";
@@ -165660,7 +165100,6 @@ self: {
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Reliable, persistent, fast priority queues";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pqueue-mtl" = callPackage
@@ -166624,6 +166063,8 @@ self: {
pname = "prim-array";
version = "0.2.2";
sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3";
+ revision = "1";
+ editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq";
libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
description = "Primitive byte array with type variable";
license = stdenv.lib.licenses.bsd3;
@@ -168921,10 +168362,8 @@ self: {
}:
mkDerivation {
pname = "pseudo-boolean";
- version = "0.1.6.0";
- sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
- revision = "2";
- editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
+ version = "0.1.7.0";
+ sha256 = "0y470jrqmc2k9j3zf2w2krjg3ial08v71bcq6zxh1g47iz4kszr7";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder containers deepseq
dlist hashable megaparsec parsec void
@@ -169834,8 +169273,8 @@ self: {
}:
mkDerivation {
pname = "pusher-http-haskell";
- version = "1.5.1.5";
- sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
+ version = "1.5.1.6";
+ sha256 = "0i5lf3aniff8lnvgkl3mmy5xbjr130baz1h25p6q3asapirbj1k0";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring cryptonite hashable
http-client http-types memory text time transformers
@@ -176900,6 +176339,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "repline_0_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, haskeline, mtl, process }:
+ mkDerivation {
+ pname = "repline";
+ version = "0.2.0.0";
+ sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc";
+ libraryHaskellDepends = [ base containers haskeline mtl process ];
+ description = "Haskeline wrapper for GHCi-like REPL interfaces";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"repo-based-blog" = callPackage
({ mkDerivation, base, blaze-html, containers, data-default
, directory, dyre, filepath, filestore, hspec, hspec-discover
@@ -177730,6 +177181,8 @@ self: {
pname = "rest-types";
version = "1.14.1.2";
sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy";
+ revision = "1";
+ editedCabalFile = "06wjl45ravvw4vjwpl15r6qdpj3va7hpsk04z1bh8xh1by0r2yhz";
libraryHaskellDepends = [
aeson base base-compat case-insensitive generic-aeson
generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -177780,15 +177233,15 @@ self: {
}) {};
"restless-git" = callPackage
- ({ mkDerivation, base, bytestring, containers, HSH, tasty
+ ({ mkDerivation, base, bytestring, clock, containers, HSH, tasty
, tasty-hunit, temporary, text, time
}:
mkDerivation {
pname = "restless-git";
- version = "0.5.0";
- sha256 = "0rz3aqrlsyld6slxq9lbpf3ydngpkka6ksr4qbl9qq6f42hb0pwi";
+ version = "0.6";
+ sha256 = "1apg2vd6yw1m02i6fd2m2i6kw08dhds93ky7ncm4psj95wwkw2al";
libraryHaskellDepends = [
- base bytestring containers HSH text time
+ base bytestring clock containers HSH text time
];
testHaskellDepends = [
base bytestring containers tasty tasty-hunit temporary text
@@ -177890,8 +177343,8 @@ self: {
pname = "rethinkdb-client-driver";
version = "0.0.25";
sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
- revision = "1";
- editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
+ revision = "3";
+ editedCabalFile = "1g4shgl944fd3qbqkd68jv6vh65plaivci4vjzfs4py7a2p62db1";
libraryHaskellDepends = [
aeson base binary bytestring containers hashable mtl network
old-locale scientific stm template-haskell text time
@@ -183642,14 +183095,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "selda_0_3_3_1" = callPackage
+ "selda_0_3_4_0" = callPackage
({ mkDerivation, base, bytestring, exceptions, hashable, mtl
, psqueues, text, time, unordered-containers
}:
mkDerivation {
pname = "selda";
- version = "0.3.3.1";
- sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr";
+ version = "0.3.4.0";
+ sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj";
libraryHaskellDepends = [
base bytestring exceptions hashable mtl psqueues text time
unordered-containers
@@ -184079,8 +183532,8 @@ self: {
}:
mkDerivation {
pname = "semirings";
- version = "0.2.1.0";
- sha256 = "0jmd7qgdwbyzck8x9i4acs9fx1ww26qr8s74raf0fv9bykynzyy2";
+ version = "0.2.1.1";
+ sha256 = "0s28qq6fk2zqzz6y76fa1ddrrmpax99mlkxhz89mw15hx04mnsjp";
libraryHaskellDepends = [
base containers hashable integer-gmp unordered-containers vector
];
@@ -184918,36 +184371,6 @@ self: {
}) {};
"servant-auth-server" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
- , bytestring, bytestring-conversion, case-insensitive, cookie
- , crypto-api, data-default-class, entropy, hspec, hspec-discover
- , http-api-data, http-client, http-types, jose, lens, lens-aeson
- , markdown-unlit, monad-time, mtl, QuickCheck, servant
- , servant-auth, servant-server, tagged, text, time, transformers
- , unordered-containers, wai, warp, wreq
- }:
- mkDerivation {
- pname = "servant-auth-server";
- version = "0.4.0.0";
- sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
- libraryHaskellDepends = [
- aeson base base64-bytestring blaze-builder bytestring
- bytestring-conversion case-insensitive cookie crypto-api
- data-default-class entropy http-api-data http-types jose lens
- monad-time mtl servant servant-auth servant-server tagged text time
- unordered-containers wai
- ];
- testHaskellDepends = [
- aeson base bytestring case-insensitive hspec http-client http-types
- jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
- servant-server time transformers wai warp wreq
- ];
- testToolDepends = [ hspec-discover markdown-unlit ];
- description = "servant-server/servant-auth compatibility";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "servant-auth-server_0_4_0_1" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
, bytestring, bytestring-conversion, case-insensitive, cookie
, crypto-api, data-default-class, entropy, hspec, hspec-discover
@@ -184960,6 +184383,8 @@ self: {
pname = "servant-auth-server";
version = "0.4.0.1";
sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
+ revision = "1";
+ editedCabalFile = "0l35r80yf1i3hjwls9cvhmzrjkgxfs103qcb1m650y77w1h3xr9p";
libraryHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
bytestring-conversion case-insensitive cookie crypto-api
@@ -184975,7 +184400,6 @@ self: {
testToolDepends = [ hspec-discover markdown-unlit ];
description = "servant-server/servant-auth compatibility";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-auth-swagger" = callPackage
@@ -185964,8 +185388,8 @@ self: {
}:
mkDerivation {
pname = "servant-proto-lens";
- version = "0.1.0.2";
- sha256 = "1p97yp3x8lhdr9z33f0pdaxj1bqjqc36gs54j69laxfq2650v3nx";
+ version = "0.1.0.3";
+ sha256 = "0j85f64rjvkm2d487ahmg64x77iyldvdwyalbxw960sdv80mjavw";
libraryHaskellDepends = [
base bytestring http-media proto-lens servant
];
@@ -187885,31 +187309,6 @@ self: {
}) {};
"shakespeare" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
- , process, scientific, template-haskell, text, time, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "shakespeare";
- version = "2.0.15";
- sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
- libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim parsec process scientific template-haskell text
- time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim hspec HUnit parsec process template-haskell
- text time transformers
- ];
- description = "A toolkit for making compile-time interpolated templates";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ psibi ];
- }) {};
-
- "shakespeare_2_0_18" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
, process, scientific, template-haskell, text, time, transformers
@@ -187931,7 +187330,6 @@ self: {
];
description = "A toolkit for making compile-time interpolated templates";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
@@ -189213,8 +188611,8 @@ self: {
({ mkDerivation, base, directory, filepath, process }:
mkDerivation {
pname = "simple-cmd";
- version = "0.1.0.0";
- sha256 = "1d9jaar1in01rwg6if6x9p2hacsdd6k6ygkrza9sbklnr4872msl";
+ version = "0.1.1";
+ sha256 = "0y9ga7m3zykrmgfzys6g7k1z79spp2319ln4sayw8i0abpwh63m9";
libraryHaskellDepends = [ base directory filepath process ];
description = "Simple String-based process commands";
license = stdenv.lib.licenses.bsd3;
@@ -190142,17 +189540,6 @@ self: {
}) {};
"singleton-nats" = callPackage
- ({ mkDerivation, base, singletons }:
- mkDerivation {
- pname = "singleton-nats";
- version = "0.4.1";
- sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss";
- libraryHaskellDepends = [ base singletons ];
- description = "Unary natural numbers relying on the singletons infrastructure";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "singleton-nats_0_4_2" = callPackage
({ mkDerivation, base, singletons }:
mkDerivation {
pname = "singleton-nats";
@@ -190161,7 +189548,6 @@ self: {
libraryHaskellDepends = [ base singletons ];
description = "Unary natural numbers relying on the singletons infrastructure";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"singleton-typelits" = callPackage
@@ -193346,8 +192732,8 @@ self: {
}:
mkDerivation {
pname = "socket-io";
- version = "1.3.10";
- sha256 = "0kq4xk1slgp2c7ik1gvpxwb0kxpwmxy943hxiq4g6bn5a1g3qis2";
+ version = "1.3.11";
+ sha256 = "078zbbhrpfb5a15vr2vjfxdyi1yabd07rg41ajvpcfqcwq4svw95";
libraryHaskellDepends = [
aeson attoparsec base bytestring engine-io mtl stm text
transformers unordered-containers vector
@@ -196502,6 +195888,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "stacked-dag" = callPackage
+ ({ mkDerivation, base, containers, doctest, graphviz
+ , optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "stacked-dag";
+ version = "0.1.0.4";
+ sha256 = "067dbhap8aras9ixrmsaw961mlnq9fd3qyksfi8gj1zld0kxbp7k";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers graphviz text ];
+ executableHaskellDepends = [
+ base containers graphviz optparse-applicative text
+ ];
+ testHaskellDepends = [ base containers doctest graphviz text ];
+ description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"staf" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -197447,31 +196852,6 @@ self: {
}) {};
"stm-conduit" = callPackage
- ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
- , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
- , QuickCheck, resourcet, stm, stm-chans, test-framework
- , test-framework-hunit, test-framework-quickcheck2, transformers
- , unliftio
- }:
- mkDerivation {
- pname = "stm-conduit";
- version = "4.0.0";
- sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
- libraryHaskellDepends = [
- async base cereal cereal-conduit conduit conduit-extra directory
- exceptions monad-loops resourcet stm stm-chans transformers
- unliftio
- ];
- testHaskellDepends = [
- base conduit directory doctest HUnit QuickCheck resourcet stm
- stm-chans test-framework test-framework-hunit
- test-framework-quickcheck2 transformers unliftio
- ];
- description = "Introduces conduits to channels, and promotes using conduits concurrently";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "stm-conduit_4_0_1" = callPackage
({ mkDerivation, async, base, cereal, cereal-conduit, conduit
, conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
, QuickCheck, resourcet, stm, stm-chans, test-framework
@@ -197494,7 +196874,6 @@ self: {
];
description = "Introduces conduits to channels, and promotes using conduits concurrently";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stm-containers" = callPackage
@@ -197698,17 +197077,6 @@ self: {
}) {};
"stm-split" = callPackage
- ({ mkDerivation, base, stm }:
- mkDerivation {
- pname = "stm-split";
- version = "0.0.2";
- sha256 = "01rqf5b75p3np5ym0am98mibmsw6vrqryad5nwjj9h5ci4wa81iw";
- libraryHaskellDepends = [ base stm ];
- description = "TMVars, TVars and TChans with distinguished input and output side";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "stm-split_0_0_2_1" = callPackage
({ mkDerivation, base, stm }:
mkDerivation {
pname = "stm-split";
@@ -197717,7 +197085,6 @@ self: {
libraryHaskellDepends = [ base stm ];
description = "TMVars, TVars and TChans with distinguished input and output side";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stm-stats" = callPackage
@@ -198134,15 +197501,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_26_0" = callPackage
+ "stratosphere_0_26_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.26.0";
- sha256 = "126fhymf1n96z40lima2kyh2sm68v63f1b7agmdpp6ihjd96xy0i";
+ version = "0.26.1";
+ sha256 = "0npmnj71gaf61gcxi772h4sgsz68j5jk7v5z3bjc120z7vc1a22v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198973,6 +198340,8 @@ self: {
pname = "strict-concurrency";
version = "0.2.4.2";
sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
+ revision = "1";
+ editedCabalFile = "12m1jbf01d4k7w1wiqcpdsbhlxi6ssbz9nx0ax2mrjjq2l0011ny";
libraryHaskellDepends = [ base deepseq ];
description = "Strict concurrency abstractions";
license = stdenv.lib.licenses.bsd3;
@@ -200169,6 +199538,8 @@ self: {
pname = "summoner";
version = "1.0.6";
sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
+ revision = "1";
+ editedCabalFile = "08rzxxxfzf5dip9va8wjqgmar5rlmm0fx3wj3vlx0i6rwqq24maz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -200193,6 +199564,8 @@ self: {
pname = "summoner";
version = "1.1.0.1";
sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
+ revision = "1";
+ editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -202949,22 +202322,6 @@ self: {
}) {};
"tagsoup" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , process, QuickCheck, text, time
- }:
- mkDerivation {
- pname = "tagsoup";
- version = "0.14.6";
- sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb";
- libraryHaskellDepends = [ base bytestring containers text ];
- testHaskellDepends = [
- base bytestring deepseq directory process QuickCheck time
- ];
- description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "tagsoup_0_14_7" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, process, QuickCheck, text, time
}:
@@ -202978,7 +202335,6 @@ self: {
];
description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tagsoup-ht" = callPackage
@@ -203777,8 +203133,8 @@ self: {
pname = "tasty-hspec";
version = "1.1.5";
sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
- revision = "2";
- editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2";
+ revision = "3";
+ editedCabalFile = "14198y7w9y4h36b6agzmsyappkhz4gmmi6nlzj137z5siwic7igm";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -203979,8 +203335,8 @@ self: {
}:
mkDerivation {
pname = "tasty-rerun";
- version = "1.1.12";
- sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+ version = "1.1.13";
+ sha256 = "1lf7i3ifszvghy0v1ahgif08bb1pgf7hhf147yr43d0r0hb2vrgp";
libraryHaskellDepends = [
base containers mtl optparse-applicative reducers split stm tagged
tasty transformers
@@ -203990,29 +203346,6 @@ self: {
}) {};
"tasty-silver" = callPackage
- ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
- , deepseq, directory, filepath, mtl, optparse-applicative, process
- , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
- , tasty-hunit, temporary, text, transformers
- }:
- mkDerivation {
- pname = "tasty-silver";
- version = "3.1.11";
- sha256 = "1rvky2661s77wnm8c0jh0hkp3jjp5c1vndv9ilg4s47kw77708az";
- libraryHaskellDepends = [
- ansi-terminal async base bytestring containers deepseq directory
- filepath mtl optparse-applicative process process-extras regex-tdfa
- semigroups stm tagged tasty temporary text
- ];
- testHaskellDepends = [
- base directory filepath process tasty tasty-hunit temporary
- transformers
- ];
- description = "A fancy test runner, including support for golden tests";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "tasty-silver_3_1_12" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring, containers
, deepseq, directory, filepath, mtl, optparse-applicative, process
, process-extras, regex-tdfa, semigroups, stm, tagged, tasty
@@ -204033,7 +203366,6 @@ self: {
];
description = "A fancy test runner, including support for golden tests";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-smallcheck" = callPackage
@@ -205215,8 +204547,8 @@ self: {
}:
mkDerivation {
pname = "term-rewriting";
- version = "0.2.1.1";
- sha256 = "0kp6hwlki99aqi4dmm0xp26y9f6zqbxz4a9ch27nyfxg283jmsl1";
+ version = "0.3";
+ sha256 = "03y5s9c9n1mnij3yh5z4c69isg5cbpwczj5sjjvajqaaqf6xy5f3";
libraryHaskellDepends = [
ansi-wl-pprint array base containers mtl multiset parsec
union-find-array
@@ -205233,6 +204565,8 @@ self: {
pname = "termbox";
version = "0.1.0";
sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+ revision = "1";
+ editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base ];
@@ -205740,8 +205074,8 @@ self: {
}:
mkDerivation {
pname = "test-karya";
- version = "0.0.2";
- sha256 = "16vrpp8qilhfk47fmcvbvdjfgzjh878kn1d4cq0bacihkv79zmf3";
+ version = "0.0.3";
+ sha256 = "1z9zyva8cqrz04ckg7dny297jp5k961nk1l7pp9kz8z78pd7p19q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206091,10 +205425,10 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.11.1";
- sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99";
+ version = "0.11.1.1";
+ sha256 = "1syvyiw84as79c76mssw1p4d3lrnghnwdyy4ip1w48qd07fadxf6";
revision = "1";
- editedCabalFile = "0szpd2kbwb9yqial0q583czy21dnkgyrhizmi7hp38kkhqp7vr9y";
+ editedCabalFile = "0740lpg42r0wdj9hm9gvnzrjka9mqpkzazx2s3qnliiigy39zk96";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206305,6 +205639,8 @@ self: {
pname = "text-format";
version = "0.3.2";
sha256 = "1qxs8xyjk8nzzzam62lqqml9s0p08m749jri0lfaa844mnw3frij";
+ revision = "1";
+ editedCabalFile = "155bddqabsxdfzdr7wl67qw9w777c2qkwxgjpx625875cvyhqkpa";
libraryHaskellDepends = [
array base double-conversion ghc-prim integer-gmp old-locale text
time transformers
@@ -207824,33 +207160,6 @@ self: {
}) {};
"these" = callPackage
- ({ mkDerivation, aeson, base, bifunctors, binary, containers
- , data-default-class, deepseq, hashable, keys, mtl, profunctors
- , QuickCheck, quickcheck-instances, semigroupoids, tasty
- , tasty-quickcheck, transformers, transformers-compat
- , unordered-containers, vector, vector-instances
- }:
- mkDerivation {
- pname = "these";
- version = "0.7.4";
- sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
- revision = "8";
- editedCabalFile = "0j3ps7ngrzgxvkbr5gf8zkfkd1ci4dnfh425ndbr2xp9ipy00nkd";
- libraryHaskellDepends = [
- aeson base bifunctors binary containers data-default-class deepseq
- hashable keys mtl profunctors QuickCheck semigroupoids transformers
- transformers-compat unordered-containers vector vector-instances
- ];
- testHaskellDepends = [
- aeson base bifunctors binary containers hashable QuickCheck
- quickcheck-instances tasty tasty-quickcheck transformers
- unordered-containers vector
- ];
- description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "these_0_7_5" = callPackage
({ mkDerivation, aeson, base, bifunctors, binary, containers
, data-default-class, deepseq, hashable, keys, mtl, profunctors
, QuickCheck, quickcheck-instances, semigroupoids, tasty
@@ -207873,7 +207182,6 @@ self: {
];
description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"these-skinny" = callPackage
@@ -209293,6 +208601,8 @@ self: {
pname = "timer-wheel";
version = "0.1.0";
sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j";
+ revision = "1";
+ editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v";
libraryHaskellDepends = [
atomic-primops base ghc-prim primitive psqueues
];
@@ -210281,6 +209591,8 @@ self: {
pname = "tomland";
version = "0.3.1";
sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw";
+ revision = "1";
+ editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -210307,6 +209619,8 @@ self: {
pname = "tomland";
version = "0.4.0";
sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr";
+ revision = "1";
+ editedCabalFile = "1d02r17m15s5z4xqyy05s515lbsqxc3kcipk25xvn24inz42qg4r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -212576,29 +211890,6 @@ self: {
}) {};
"turtle" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
- , containers, criterion, directory, doctest, exceptions, foldl
- , hostname, managed, optional-args, optparse-applicative, process
- , semigroups, stm, system-fileio, system-filepath, temporary, text
- , time, transformers, unix, unix-compat
- }:
- mkDerivation {
- pname = "turtle";
- version = "1.5.10";
- sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs";
- libraryHaskellDepends = [
- ansi-wl-pprint async base bytestring clock containers directory
- exceptions foldl hostname managed optional-args
- optparse-applicative process semigroups stm system-fileio
- system-filepath temporary text time transformers unix unix-compat
- ];
- testHaskellDepends = [ base doctest system-filepath temporary ];
- benchmarkHaskellDepends = [ base criterion text ];
- description = "Shell programming, Haskell-style";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "turtle_1_5_11" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
, containers, criterion, directory, doctest, exceptions, foldl
, hostname, managed, optional-args, optparse-applicative, process
@@ -212619,7 +211910,6 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Shell programming, Haskell-style";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"turtle-options" = callPackage
@@ -214173,6 +213463,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "typelits-witnesses_0_3_0_3" = callPackage
+ ({ mkDerivation, base, constraints, reflection }:
+ mkDerivation {
+ pname = "typelits-witnesses";
+ version = "0.3.0.3";
+ sha256 = "078r9pbkzwzm1q821zqisj0wrx1rdk9w8c3ip0g1m5j97zzlmpaf";
+ libraryHaskellDepends = [ base constraints reflection ];
+ description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"typenums" = callPackage
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
@@ -214385,27 +213687,6 @@ self: {
}) {};
"tzdata" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
- , test-framework, test-framework-hunit, test-framework-th, unix
- , vector
- }:
- mkDerivation {
- pname = "tzdata";
- version = "0.1.20180122.0";
- sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base bytestring containers deepseq vector
- ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit
- test-framework-th unix
- ];
- description = "Time zone database (as files and as a module)";
- license = stdenv.lib.licenses.asl20;
- }) {};
-
- "tzdata_0_1_20180501_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, HUnit
, test-framework, test-framework-hunit, test-framework-th, unix
, vector
@@ -214424,7 +213705,6 @@ self: {
];
description = "Time zone database (as files and as a module)";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"u2f" = callPackage
@@ -214557,6 +213837,8 @@ self: {
pname = "udbus";
version = "0.2.3";
sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n";
+ revision = "1";
+ editedCabalFile = "036yscknrmc7dcm111bsjk7q0ghb6ih5b6z1ffsqf442dg83x8w7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -214830,6 +214112,8 @@ self: {
pname = "unagi-chan";
version = "0.4.1.0";
sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb";
+ revision = "1";
+ editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p";
libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
testHaskellDepends = [
atomic-primops base containers ghc-prim primitive
@@ -214903,8 +214187,8 @@ self: {
}:
mkDerivation {
pname = "unbound-generics";
- version = "0.3.3";
- sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
+ version = "0.3.4";
+ sha256 = "01g8zhf9plgl3fcj57fkma3rkdwmh28rla3r1cr0bfmbd03q3fva";
libraryHaskellDepends = [
ansi-wl-pprint base containers contravariant deepseq exceptions mtl
profunctors template-haskell transformers transformers-compat
@@ -216135,28 +215419,6 @@ self: {
}) {};
"unliftio" = callPackage
- ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
- , process, stm, time, transformers, unix, unliftio-core
- }:
- mkDerivation {
- pname = "unliftio";
- version = "0.2.8.0";
- sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
- revision = "1";
- editedCabalFile = "1l9hncv1pavdqyy1zmjfypqd23m243x5fiid7vh1rki71fdlh9z0";
- libraryHaskellDepends = [
- async base deepseq directory filepath process stm time transformers
- unix unliftio-core
- ];
- testHaskellDepends = [
- async base deepseq directory filepath hspec process stm time
- transformers unix unliftio-core
- ];
- description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "unliftio_0_2_8_1" = callPackage
({ mkDerivation, async, base, deepseq, directory, filepath, hspec
, process, stm, time, transformers, unix, unliftio-core
}:
@@ -216176,7 +215438,6 @@ self: {
];
description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unliftio-core" = callPackage
@@ -218977,15 +218238,16 @@ self: {
}) {};
"vector-extras" = callPackage
- ({ mkDerivation, base, containers, deferred-folds, hashable
+ ({ mkDerivation, base, containers, deferred-folds, foldl, hashable
, unordered-containers, vector
}:
mkDerivation {
pname = "vector-extras";
- version = "0.2";
- sha256 = "0c0wq7ymjhfhxdwkgjd7iwp4vb22495ajrv2ddq6iihc4svakzlw";
+ version = "0.2.1";
+ sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz";
libraryHaskellDepends = [
- base containers deferred-folds hashable unordered-containers vector
+ base containers deferred-folds foldl hashable unordered-containers
+ vector
];
description = "Utilities for the \"vector\" library";
license = stdenv.lib.licenses.mit;
@@ -219468,6 +218730,8 @@ self: {
pname = "versions";
version = "3.5.0";
sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w";
+ revision = "1";
+ editedCabalFile = "13gb4n3bdkbgf199q3px7ihaqycbx76cb8isrs3qn16n67mx5b2f";
libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
testHaskellDepends = [
base base-prelude checkers megaparsec microlens QuickCheck tasty
@@ -220697,23 +219961,22 @@ self: {
({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
, bytestring, case-insensitive, containers, cookie
, data-default-class, deepseq, directory, fast-logger, hspec
- , http-types, HUnit, iproute, lifted-base, network, old-locale
- , resourcet, streaming-commons, stringsearch, text, time
- , transformers, unix, unix-compat, vault, void, wai, wai-logger
- , word8, zlib
+ , http-types, HUnit, iproute, network, old-locale, resourcet
+ , streaming-commons, text, time, transformers, unix, unix-compat
+ , vault, void, wai, wai-logger, word8, zlib
}:
mkDerivation {
pname = "wai-extra";
- version = "3.0.24.2";
- sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci";
+ version = "3.0.24.3";
+ sha256 = "0ff4mzxqj3h5zn27q9pq0q89x087dy072z24bczn4irry0zzks21";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal base base64-bytestring bytestring
case-insensitive containers cookie data-default-class deepseq
- directory fast-logger http-types iproute lifted-base network
- old-locale resourcet streaming-commons stringsearch text time
- transformers unix unix-compat vault void wai wai-logger word8 zlib
+ directory fast-logger http-types iproute network old-locale
+ resourcet streaming-commons text time transformers unix unix-compat
+ vault void wai wai-logger word8 zlib
];
testHaskellDepends = [
base bytestring case-insensitive cookie fast-logger hspec
@@ -221628,6 +220891,8 @@ self: {
pname = "wai-middleware-travisci";
version = "0.1.0";
sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv";
+ revision = "1";
+ editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptonite http-types text
transformers vault wai
@@ -223427,40 +222692,6 @@ self: {
}) {};
"websockets" = callPackage
- ({ mkDerivation, attoparsec, base, base64-bytestring, binary
- , bytestring, bytestring-builder, case-insensitive, containers
- , criterion, entropy, HUnit, network, QuickCheck, random, SHA
- , streaming-commons, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text
- }:
- mkDerivation {
- pname = "websockets";
- version = "0.12.5.1";
- sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base base64-bytestring binary bytestring
- bytestring-builder case-insensitive containers entropy network
- random SHA streaming-commons text
- ];
- testHaskellDepends = [
- attoparsec base base64-bytestring binary bytestring
- bytestring-builder case-insensitive containers entropy HUnit
- network QuickCheck random SHA streaming-commons test-framework
- test-framework-hunit test-framework-quickcheck2 text
- ];
- benchmarkHaskellDepends = [
- attoparsec base base64-bytestring binary bytestring
- bytestring-builder case-insensitive containers criterion entropy
- network random SHA text
- ];
- doCheck = false;
- description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "websockets_0_12_5_2" = callPackage
({ mkDerivation, attoparsec, base, base64-bytestring, binary
, bytestring, bytestring-builder, case-insensitive, containers
, criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -223492,7 +222723,6 @@ self: {
doCheck = false;
description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"websockets-rpc" = callPackage
@@ -223983,8 +223213,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind";
- version = "0.1.2.1";
- sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
+ version = "0.1.2.2";
+ sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
libraryHaskellDepends = [
base containers semigroups text transformers
];
@@ -223995,14 +223225,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "wild-bind_0_1_2_2" = callPackage
+ "wild-bind_0_1_2_3" = callPackage
({ mkDerivation, base, containers, hspec, microlens, QuickCheck
, semigroups, stm, text, transformers
}:
mkDerivation {
pname = "wild-bind";
- version = "0.1.2.2";
- sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
+ version = "0.1.2.3";
+ sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12";
libraryHaskellDepends = [
base containers semigroups text transformers
];
@@ -224052,8 +223282,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind-x11";
- version = "0.2.0.4";
- sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
+ version = "0.2.0.5";
+ sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
libraryHaskellDepends = [
base containers fold-debounce mtl semigroups stm text transformers
wild-bind X11
@@ -224065,14 +223295,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "wild-bind-x11_0_2_0_5" = callPackage
+ "wild-bind-x11_0_2_0_6" = callPackage
({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
, semigroups, stm, text, time, transformers, wild-bind, X11
}:
mkDerivation {
pname = "wild-bind-x11";
- version = "0.2.0.5";
- sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
+ version = "0.2.0.6";
+ sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9";
libraryHaskellDepends = [
base containers fold-debounce mtl semigroups stm text transformers
wild-bind X11
@@ -225879,29 +225109,6 @@ self: {
}) {inherit (pkgs.xorg) libXi;};
"x509" = callPackage
- ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
- , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
- , tasty, tasty-quickcheck
- }:
- mkDerivation {
- pname = "x509";
- version = "1.7.3";
- sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
- revision = "1";
- editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
- libraryHaskellDepends = [
- asn1-encoding asn1-parse asn1-types base bytestring containers
- cryptonite hourglass memory mtl pem
- ];
- testHaskellDepends = [
- asn1-types base bytestring cryptonite hourglass mtl tasty
- tasty-quickcheck
- ];
- description = "X509 reader and writer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "x509_1_7_4" = callPackage
({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
, bytestring, containers, cryptonite, hourglass, memory, mtl, pem
, tasty, tasty-quickcheck
@@ -225910,6 +225117,8 @@ self: {
pname = "x509";
version = "1.7.4";
sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717";
+ revision = "1";
+ editedCabalFile = "0p9zzzj118n8ymacj6yp7nkf22d09mj31wnzc1alq26w2ybcrifz";
libraryHaskellDepends = [
asn1-encoding asn1-parse asn1-types base bytestring containers
cryptonite hourglass memory mtl pem
@@ -225920,7 +225129,6 @@ self: {
];
description = "X509 reader and writer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"x509-store" = callPackage
@@ -226678,29 +225886,6 @@ self: {
}) {};
"xml-conduit" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
- , bytestring, conduit, conduit-extra, containers
- , data-default-class, deepseq, hspec, HUnit, monad-control
- , resourcet, text, transformers, xml-types
- }:
- mkDerivation {
- pname = "xml-conduit";
- version = "1.8.0";
- sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
- libraryHaskellDepends = [
- attoparsec base blaze-html blaze-markup bytestring conduit
- conduit-extra containers data-default-class deepseq monad-control
- resourcet text transformers xml-types
- ];
- testHaskellDepends = [
- base blaze-markup bytestring conduit containers hspec HUnit
- resourcet text transformers xml-types
- ];
- description = "Pure-Haskell utilities for dealing with XML with the conduit package";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "xml-conduit_1_8_0_1" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
, bytestring, conduit, conduit-extra, containers
, data-default-class, deepseq, doctest, hspec, HUnit, resourcet
@@ -226721,7 +225906,6 @@ self: {
];
description = "Pure-Haskell utilities for dealing with XML with the conduit package";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"xml-conduit-decode" = callPackage
@@ -227460,8 +226644,8 @@ self: {
}:
mkDerivation {
pname = "xmonad";
- version = "0.14.2";
- sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949";
+ version = "0.15";
+ sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -227509,10 +226693,8 @@ self: {
}:
mkDerivation {
pname = "xmonad-contrib";
- version = "0.14";
- sha256 = "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y";
- revision = "2";
- editedCabalFile = "0412lfkq9y2s7avzm7ajx5fmyacqrad3yzv9cz9xp5dg66dn5h60";
+ version = "0.15";
+ sha256 = "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms";
libraryHaskellDepends = [
base bytestring containers directory extensible-exceptions filepath
mtl old-locale old-time process random semigroups unix utf8-string
@@ -227651,13 +226833,12 @@ self: {
}:
mkDerivation {
pname = "xmonad-vanessa";
- version = "2.0.0.0";
- sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf";
+ version = "2.1.0.0";
+ sha256 = "1np1rq4rn7xm1wqj3bvb279xab7vv95vxhnnbrn6xjygzd7iblxx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
alsa-mixer base composition-prelude containers process X11 xmonad
- xmonad-contrib
];
executableHaskellDepends = [
base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume
@@ -229306,6 +228487,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "yesod-auth-fb_1_9_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
+ , resourcet, shakespeare, text, time, transformers, unliftio, wai
+ , yesod-auth, yesod-core, yesod-fb
+ }:
+ mkDerivation {
+ pname = "yesod-auth-fb";
+ version = "1.9.1";
+ sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i";
+ libraryHaskellDepends = [
+ aeson base bytestring conduit fb http-conduit resourcet shakespeare
+ text time transformers unliftio wai yesod-auth yesod-core yesod-fb
+ ];
+ description = "Authentication backend for Yesod using Facebook";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-auth-hashdb" = callPackage
({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
, hspec, http-conduit, http-types, monad-logger, network-uri
@@ -230320,26 +229519,6 @@ self: {
}) {};
"yesod-paginator" = callPackage
- ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
- , persistent, safe, text, transformers, uri-encode, yesod-core
- , yesod-persistent, yesod-test
- }:
- mkDerivation {
- pname = "yesod-paginator";
- version = "1.1.0.0";
- sha256 = "03h9zpplsglblcdf0cm36i3kmmfbhk6iqwq2vsh8nw5ygizcqh0n";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base blaze-markup path-pieces persistent safe text transformers
- uri-encode yesod-core yesod-persistent
- ];
- testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
- description = "A pagination approach for yesod";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "yesod-paginator_1_1_0_1" = callPackage
({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
, persistent, safe, text, transformers, uri-encode, yesod-core
, yesod-test
@@ -230357,7 +229536,6 @@ self: {
testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
description = "A pagination approach for yesod";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-paypal-rest" = callPackage
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 8dae7c8d72c0..6155e158e9de 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -299,12 +299,7 @@ rec {
overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
# Get all of the build inputs of a haskell package, divided by category.
- getBuildInputs = p:
- (overrideCabal p (args: {
- passthru = (args.passthru or {}) // {
- _getBuildInputs = extractBuildInputs p.compiler args;
- };
- }))._getBuildInputs;
+ getBuildInputs = p: p.getBuildInputs;
# Extract the haskell build inputs of a haskell package.
# This is useful to build environments for developing on that
@@ -339,55 +334,6 @@ rec {
, ...
}: { inherit doCheck doBenchmark; };
- # Divide the build inputs of the package into useful sets.
- extractBuildInputs = ghc:
- { setupHaskellDepends ? [], extraLibraries ? []
- , librarySystemDepends ? [], executableSystemDepends ? []
- , pkgconfigDepends ? [], libraryPkgconfigDepends ? []
- , executablePkgconfigDepends ? [], testPkgconfigDepends ? []
- , benchmarkPkgconfigDepends ? [], testDepends ? []
- , testHaskellDepends ? [], testSystemDepends ? []
- , testToolDepends ? [], benchmarkDepends ? []
- , benchmarkHaskellDepends ? [], benchmarkSystemDepends ? []
- , benchmarkToolDepends ? [], buildDepends ? []
- , libraryHaskellDepends ? [], executableHaskellDepends ? []
- , ...
- }@args:
- let inherit (ghcInfo ghc) isGhcjs nativeGhc;
- inherit (controlPhases ghc args) doCheck doBenchmark;
- isHaskellPkg = x: x ? isHaskellLibrary;
- allPkgconfigDepends =
- pkgconfigDepends ++ libraryPkgconfigDepends ++
- executablePkgconfigDepends ++
- lib.optionals doCheck testPkgconfigDepends ++
- lib.optionals doBenchmark benchmarkPkgconfigDepends;
- otherBuildInputs =
- setupHaskellDepends ++ extraLibraries ++
- librarySystemDepends ++ executableSystemDepends ++
- allPkgconfigDepends ++
- lib.optionals doCheck ( testDepends ++ testHaskellDepends ++
- testSystemDepends ++ testToolDepends
- ) ++
- # ghcjs's hsc2hs calls out to the native hsc2hs
- lib.optional isGhcjs nativeGhc ++
- lib.optionals doBenchmark ( benchmarkDepends ++
- benchmarkHaskellDepends ++
- benchmarkSystemDepends ++
- benchmarkToolDepends
- );
- propagatedBuildInputs =
- buildDepends ++ libraryHaskellDepends ++
- executableHaskellDepends;
- allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
- isHaskellPartition =
- lib.partition isHaskellPkg allBuildInputs;
- in
- { haskellBuildInputs = isHaskellPartition.right;
- systemBuildInputs = isHaskellPartition.wrong;
- inherit propagatedBuildInputs otherBuildInputs
- allPkgconfigDepends;
- };
-
# Utility to convert a directory full of `cabal2nix`-generated files into a
# package override set
#
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index b6fe399058c3..ef2c33c10915 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -43,7 +43,7 @@ let
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
nodejs = buildPackages.nodejs-slim;
- inherit (self) buildHaskellPackages ghc;
+ inherit (self) buildHaskellPackages ghc shellFor;
inherit (self.buildHaskellPackages) jailbreak-cabal;
hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: {
isLibrary = false;
@@ -259,20 +259,46 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
shellFor = { packages, withHoogle ? false, ... } @ args:
let
selected = packages self;
- packageInputs = builtins.map getBuildInputs selected;
- haskellInputs =
- builtins.filter
- (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
- (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
+
+ packageInputs = map getBuildInputs selected;
+
+ name = if pkgs.lib.length selected == 1
+ then "ghc-shell-for-${(pkgs.lib.head selected).name}"
+ else "ghc-shell-for-packages";
+
+ # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
+ # because cabal will end up ignoring that built version, assuming
+ # new-style commands.
+ haskellInputs = pkgs.lib.filter
+ (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
+ (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;
+
withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages;
+ ghcEnv = withPackages (p: haskellInputs);
+ nativeBuildInputs = pkgs.lib.concatMap (p: p.nativeBuildInputs) selected;
+
+ ghcCommand' = if ghc.isGhcjs or false then "ghcjs" else "ghc";
+ ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
+ ghcCommandCaps= pkgs.lib.toUpper ghcCommand';
+
mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
in pkgs.stdenv.mkDerivation (mkDrvArgs // {
- name = "ghc-shell-for-packages";
- nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or [];
+ name = mkDrvArgs.name or name;
+
buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
+ nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs ++ mkDrvArgs.nativeBuildInputs or [];
phases = ["installPhase"];
installPhase = "echo $nativeBuildInputs $buildInputs > $out";
+ LANG = "en_US.UTF-8";
+ LOCALE_ARCHIVE = pkgs.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+ "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+ "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+ # TODO: is this still valid?
+ "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+ "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
+ then "${ghcEnv}/lib/HaLVM-${ghc.version}"
+ else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
});
ghc = ghc // {
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index cb351446301d..11feb1170c2c 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, readline, libedit }:
+{ stdenv, fetchFromGitHub, readline, libedit, bc }:
stdenv.mkDerivation rec {
name = "j-${version}";
- version = "808";
+ version = "807";
jtype = "release";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
- sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf";
+ sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n";
};
- buildInputs = [ readline libedit ];
+ buildInputs = [ readline libedit bc ];
bits = if stdenv.is64bit then "64" else "32";
platform =
- /*if stdenv.isRaspberryPi then "raspberry" else*/
+ if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else
if stdenv.isLinux then "linux" else
if stdenv.isDarwin then "darwin" else
"unknown";
@@ -24,18 +24,24 @@ stdenv.mkDerivation rec {
buildPhase = ''
export SOURCE_DIR=$(pwd)
export HOME=$TMPDIR
- export JBIN=$HOME/j${bits}/bin
export JLIB=$SOURCE_DIR/jlibrary
+
+ export jbld=$HOME/bld
+ export jplatform=${platform}
+ export jmake=$SOURCE_DIR/make
+ export jgit=$SOURCE_DIR
+ export JBIN=$jbld/j${bits}/bin
mkdir -p $JBIN
+ echo $OUT_DIR
+
cd make
patchShebangs .
- sed -i jvars.sh -e '
- s@~/gitdev/jsource@$SOURCE_DIR@;
+ sed -i jvars.sh -e "
+ s@~/git/jsource@$SOURCE_DIR@;
s@~/jbld@$HOME@;
- s@linux@${platform}@;
- '
+ "
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
@@ -48,7 +54,7 @@ stdenv.mkDerivation rec {
#define jplatform "${platform}"
#define jtype "${jtype}" // release,beta,...
#define jlicense "GPL3"
- #define jbuilder "unknown" // website or email
+ #define jbuilder "nixpkgs" // website or email
' > ../jsrc/jversion.h
./build_jconsole.sh j${bits}
@@ -60,16 +66,17 @@ stdenv.mkDerivation rec {
# Now run the real tests
cd $SOURCE_DIR/test
- # for f in *.ijs
- # do
- # echo $f
- # $JBIN/jconsole < $f
- # done
+ for f in *.ijs
+ do
+ echo $f
+ $JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS
+ done
'';
installPhase = ''
mkdir -p "$out"
cp -r $JBIN "$out/bin"
+ rm $out/bin/*.txt # Remove logs from the bin folder
mkdir -p "$out/share/j"
cp -r $JLIB/{addons,system} "$out/share/j"
@@ -78,8 +85,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "J programming language, an ASCII-based APL successor";
- maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ raskin synthetica ];
+ platforms = with platforms; linux ++ darwin;
license = licenses.gpl3Plus;
homepage = http://jsoftware.com/;
};
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 57b44c0035ad..f2b900412081 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -37,6 +37,8 @@ let
stdenv.lib.optional crossCompiling "dev";
setOutputFlags = false;
+ disallowedReferences = [ stdenv.cc ];
+
patches =
[ ]
# Do not look in /usr etc. for dependencies.
@@ -119,6 +121,7 @@ let
--replace "${
if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
}" /no-such-path \
+ --replace "${stdenv.cc}" /no-such-path \
--replace "$man" /no-such-path
'' + stdenv.lib.optionalString crossCompiling
''
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 7d6f2541d3d1..976d30819dbe 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
./deterministic-build.patch
];
+ # Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since
+ # we only use this python for bootstrappy things, it doesn't really matter if it
+ # doesn't have perfect proxy support in urllib :) this just makes it fall back on env
+ # vars instead of attempting to read the proxy configuration automatically, so not a
+ # huge loss even if for whatever reason we did want proxy support.
+ postPatch = ''
+ substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False"
+ '';
+
DETERMINISTIC_BUILD = 1;
preConfigure = ''
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 0de1e35440b9..787c54c1b0a3 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
- version = "4.12.1";
+ version = "4.13";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9";
+ sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 39b3d6aba6bd..2aacfd07364f 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
, libuuid, json-glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
- name = "appstream-glib-0.7.12";
+ name = "appstream-glib-0.7.13";
outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
- sha256 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax";
+ sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/development/libraries/arrow-cpp/darwin.patch
new file mode 100644
index 000000000000..de9b1986ffed
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/darwin.patch
@@ -0,0 +1,11 @@
+diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake
+--- a/cmake_modules/FindPythonLibsNew.cmake
++++ b/cmake_modules/FindPythonLibsNew.cmake
+@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
+ list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
+ list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH)
+ list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS)
++string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}")
+
+ # Make sure the Python has the same pointer-size as the chosen compiler
+ # Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 952f7435c069..16fc7e0c960d 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,15 +2,18 @@
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
+ sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
};
sourceRoot = "apache-arrow-${version}/cpp";
+ # patch to fix python-test
+ patches = [ ./darwin.patch ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ boost python.pkgs.python python.pkgs.numpy ];
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 813f8c3c9640..288bd9a9dd09 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
};
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index da71e40187f4..012c1d123b62 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
- version = "7.6.6";
+ version = "7.6.8";
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
- sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
+ sha256 = "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4";
};
buildInputs = [ libatomic_ops ];
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index a06691d5c715..428114986d1b 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
};
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 9759e4904b29..afeb7064ffea 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
};
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index d8150fd11508..97db6880c5f0 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
};
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 085bab6475c2..3f81c39a9b22 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
};
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 87752867c350..cec7e1a2d516 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -36,15 +36,15 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-openssl=${openssl.dev}"
+ "--with-plugindir=${placeholder "out"}/lib/sasl2"
+ "--with-saslauthd=/run/saslauthd"
+ "--enable-login"
+ "--enable-shared"
] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
- # Set this variable at build-time to make sure $out can be evaluated.
- preConfigure = ''
- configureFlagsArray=( --with-plugindir=$out/lib/sasl2
- --with-saslauthd=/run/saslauthd
- --enable-login
- )
- '';
+ # Avoid triggering regenerating using broken autoconf/libtool bits.
+ # (many distributions carry patches to remove/replace, but this works for now)
+ dontUpdateAutotoolsGnuConfigScripts = if stdenv.hostPlatform.isMusl then true else null;
installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://cyrusimap.web.cmu.edu/;
+ homepage = https://www.cyrusimap.org/sasl;
description = "Library for adding authentication support to connection-based protocols";
platforms = platforms.unix;
license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index cc62b2776ede..7c3dd19a4795 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "epoxy-${version}";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "anholt";
repo = "libepoxy";
rev = "${version}";
- sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci";
+ sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch
index 6f50b9d262b5..8f38ee27174b 100644
--- a/pkgs/development/libraries/epoxy/libgl-path.patch
+++ b/pkgs/development/libraries/epoxy/libgl-path.patch
@@ -1,20 +1,11 @@
-From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Thu, 29 Mar 2018 07:21:02 -0500
-Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined.
-
----
- src/dispatch_common.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index bc2fb94..776237b 100644
+index b3e4f5f..303e8f5 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
-@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
- pthread_mutex_lock(&api.mutex);
- if (!*handle) {
- *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
+ flags |= RTLD_NOLOAD;
+
+ *handle = dlopen(lib_name, flags);
+#ifdef LIBGL_PATH
+ if (!*handle) {
+ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1];
@@ -24,12 +15,10 @@ index bc2fb94..776237b 100644
+ fprintf(stderr, "Error prefixing library pathname\n");
+ exit(1);
+ }
-+ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL);
++ *handle = dlopen(pathbuf, flags);
+ }
+#endif
++
if (!*handle) {
if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
---
-2.16.3
-
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7d72de2a2ded..7c3b3447d613 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus
+, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
+, x264, x265, xvidcore, zlib, libopus, speex
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
"--enable-libmp3lame"
(ifMinVer "1.2" "--enable-iconv")
"--enable-libtheora"
+ (ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
"--enable-vdpau"
"--enable-libvorbis"
@@ -141,6 +142,7 @@ stdenv.mkDerivation rec {
"--enable-libxvid"
"--enable-zlib"
(ifMinVer "2.8" "--enable-libopus")
+ "--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265")
# Developer flags
(enableFeature debugDeveloper "debug")
@@ -157,8 +159,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
buildInputs = [
- bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
- libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
+ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
+ libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index f6d8cd6fa4c2..1fe3bcf6cede 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gdal-${version}";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
- sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw";
+ sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z";
};
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 685775e2918d..8d88dc04924b 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "gdbm-1.17";
- # FIXME: remove on update to > 1.17
+ name = "gdbm-1.18";
+ # FIXME: remove on update to > 1.18
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz";
- sha256 = "0zcp2iv5dbab18859a5fvacg8lkp8k4pr9af13kfvami6lpcrn3w";
+ sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
};
doCheck = true; # not cross;
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3fb50e98c1c8..9fece4cb7a54 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
# src = fetchurl {
- # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ # url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
# };
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4531a5a01d4c..1b2f6bbc2225 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;
enableParallelBuilding = true;
+ enableParallelChecking = false; # fails sometimes
meta = with lib; {
description = "Well integrated set of translation tools and documentation";
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 3deaf28373dd..4ac6e87b9dd7 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
};
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f03ddfc48b2e..508a012c6900 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
name = "glib-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
};
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 7f8a2276ef25..6423e1fce981 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "gmm-${version}";
- version = "5.1";
+ version = "5.3";
src = fetchurl {
- url ="http://download.gna.org/getfem/stable/${name}.tar.gz";
- sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh";
+ url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+ sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
};
meta = with stdenv.lib; {
description = "Generic C++ template library for sparse, dense and skyline matrices";
- homepage = http://home.gna.org/getfem/gmm_intro.html;
+ homepage = http://getfem.org/gmm.html;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5ab5005bad4..b2c0a9f89a48 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
};
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 71fe23ea6b0d..416ecb5631ed 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -2,7 +2,7 @@
, file, which
, autoreconfHook
, git
-, texinfo5
+, texinfo
, qtbase ? null
, withPython ? false, swig2 ? null, python ? null
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase;
- nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
+ nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
++ lib.optionals withPython [ python swig2 which ];
postPatch =''
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 051228aeb152..0145272c2819 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
outputBin = "dev";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
};
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 27052d1922f6..015843c05393 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
name = "gtk+3-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
+ url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
};
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index fe81c97ab6eb..9e1bc5363a1f 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
version = "3.24.6";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
};
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 2501e0253b39..7cd9de4b06b1 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
version = "4.0.0";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
};
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 360c1fb41f4e..6bcf72b8a7e6 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
};
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0c0fc3861c9e..a887384f94da 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "libatomic_ops-${version}";
- version = "7.6.4";
+ version = "7.6.6";
src = fetchurl {
urls = [
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
];
- sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv";
+ sha256 = "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 8addb6128f0c..460a58a19a70 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
, gtk ? null
, libpulseaudio, gst_all_1, libvorbis, libcap
+, CoreServices
, withAlsa ? stdenv.isLinux, alsaLib }:
stdenv.mkDerivation rec {
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libpulseaudio libvorbis gtk
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
+ ++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional stdenv.isLinux libcap
++ lib.optional withAlsa alsaLib;
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index e4864aded279..677910328458 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
};
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 59e576fd3923..5dc153dd5ccc 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "libdaemon-0.14";
src = fetchurl {
@@ -8,6 +8,8 @@ stdenv.mkDerivation (rec {
sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
};
+ patches = [ ./fix-includes.patch ];
+
configureFlags = [ "--disable-lynx" ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ # Can't run this test while cross-compiling
@@ -16,16 +18,8 @@ stdenv.mkDerivation (rec {
meta = {
description = "Lightweight C library that eases the writing of UNIX daemons";
-
homepage = http://0pointer.de/lennart/projects/libdaemon/;
-
license = stdenv.lib.licenses.lgpl2Plus;
-
platforms = stdenv.lib.platforms.unix;
- maintainers = [ ];
};
-} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
- # This patch should be applied unconditionally, but doing so will cause mass rebuild.
- patches = ./fix-includes.patch;
-})
-
+}
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5107d8898d46..761216f420bb 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.93";
+ name = "libdrm-2.4.94";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f";
+ sha256 = "1ghn3l1dv1rsp9z6jpmy4ryna1s8rm4xx0ds532041bnlfq5jg5p";
};
outputs = [ "out" "dev" "bin" ];
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 20a08885142a..bcd37396bf7f 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -2,11 +2,11 @@
, python, perl, gdk_pixbuf, libiconv, libintl }:
stdenv.mkDerivation rec {
- name = "libgsf-1.14.42";
+ name = "libgsf-1.14.44";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
- sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";
+ sha256 = "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8";
};
nativeBuildInputs = [ pkgconfig intltool libintl ];
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index d0be9e25b87e..bab7ede2d6e8 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
};
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 54760549a164..e07622eb13af 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
};
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 91e8e2d50f19..81e5f0fe73ea 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
};
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
new file mode 100644
index 000000000000..d232e268f309
--- /dev/null
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, unzip }:
+
+with stdenv;
+
+let
+ version = "2.12.1";
+in
+ mkDerivation {
+ name = "libimagequant-${version}";
+ src = fetchFromGitHub {
+ owner = "ImageOptim";
+ repo = "libimagequant";
+ rev = "${version}";
+ sha256 = "0r7zgsnhqci2rjilh9bzw43miwp669k6b7q16hdjzrq4nr0xpvbl";
+ };
+
+ preConfigure = ''
+ patchShebangs ./configure
+ '';
+
+ meta = {
+ homepage = https://pngquant.org/lib/;
+ description = "Image quantization library";
+ longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ ma9e ];
+ };
+ }
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index d42bd315d22f..e2d7d09b259c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
- version = "1.11.3";
+ version = "1.12.1";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk";
+ sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p";
};
outputs = [ "bin" "out" "dev" ];
@@ -46,12 +46,6 @@ stdenv.mkDerivation rec {
patches = [ ./udev-absolute-path.patch ];
- preBuild = ''
- # meson setup-hook changes the directory so the files are located one level up
- patchShebangs ../udev/parse_hwdb.py
- patchShebangs ../test/symbols-leak-test.in
- '';
-
doCheck = testsSupport;
meta = {
diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch
index fb22fea40e80..5c85b8639486 100644
--- a/pkgs/development/libraries/libinput/udev-absolute-path.patch
+++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch
@@ -5,7 +5,7 @@
udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '')
-+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
++udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules',
install : true,
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index e30f2b0af5d5..1ac4a7185122 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -46,7 +46,7 @@ in {
};
libressl_2_8 = generic {
- version = "2.8.0";
- sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg";
+ version = "2.8.1";
+ sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk";
};
}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 76b7e7ccaee9..7c94919f344a 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2";
};
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index fde3c7a7b30e..4fc0d6688d4e 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
};
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index a68b5b2b6d5e..b150dd0f59c3 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch";
sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df";
})
+ (fetchurl {
+ name = "CVE-2018-13139.patch";
+ url = "https://github.com/erikd/libsndfile/commit/aaea680337267bfb6d2544da878890ee7f1c5077.patch";
+ sha256 = "01q3m7pa3xqkh05ijmfgv064v8flkg4p24bgy9wxnc6wfcdifggx";
+ })
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 2804486e2f0a..9849e2600bb0 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "2.62.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
};
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 24da3a8e2c7d..312a5c118103 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -19,7 +19,19 @@ stdenv.mkDerivation rec {
doCheck = true;
- enableParallelBuilding = true;
+ /* This seems to cause several random failures like these, which I assume
+ is because of bad or missing target dependencies in their build system:
+
+ ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+ FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
+
+ FAIL: unistdio/test-u16-vasnprintf3.sh
+ ======================================
+
+ ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+ FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
+ */
+ enableParallelBuilding = false;
meta = {
homepage = http://www.gnu.org/software/libunistring/;
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 067f8fb432d5..73d2db8e9993 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot"
"multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
- "tty_pty"
+ "tty_pty" "condvar_5"
] ++ stdenv.lib.optionals stdenv.isAarch32 [
# I observe this test failing with some regularity on ARMv7:
# https://github.com/libuv/libuv/issues/1871
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d693..3137ac2c8f2b 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec{
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
};
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
deleted file mode 100644
index 2bfdb679156c..000000000000
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, flex, bison
-, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau
-, OpenGL, apple_sdk, Xplugin
-}:
-
-let
- version = "8.0.5";
- self = stdenv.mkDerivation rec {
- name = "mesa-${version}";
-
- src = fetchurl {
- url = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${version}/MesaLib-${version}.tar.bz2";
- sha256 = "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si";
- };
-
- nativeBuildInputs = [ pkgconfig python makedepend flex bison ];
-
- buildInputs = with xorg; [
- glproto dri2proto libXfixes libXi libXmu
- intltool expat libxml2Python llvm
- presentproto
- libX11 libXext libxcb libXt libxshmfence
- libffi libvdpau
- ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ];
-
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
-
- postUnpack = ''
- ln -s darwin $sourceRoot/configs/current
- '';
-
- preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace bin/mklib --replace g++ clang++
- '';
-
- patches = [
- ./patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
- ./patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
- ./patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
- ./patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
- ./patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
- ./patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
- ./patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
- ./patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
- ./patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
- ./patches/patch-src-mapi-vgapi-Makefile.diff
- ];
-
- postPatch = "patchShebangs .";
-
- configurePhase = ":";
-
- configureFlags = [
- # NOTE: Patents expired on June 17 2018.
- # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed
- "texture-float"
- ];
-
- makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++";
-
- enableParallelBuilding = true;
-
- passthru = { inherit version; };
-
- meta = {
- description = "An open source implementation of OpenGL";
- homepage = http://www.mesa3d.org/;
- license = "bsd";
- platforms = stdenv.lib.platforms.darwin;
- maintainers = with stdenv.lib.maintainers; [ cstrahan ];
- };
- };
-in self // { driverLink = self; }
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch b/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
deleted file mode 100644
index 5466ffc90858..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 9cf1afbf8ae87ddbb29b24a0f9f2724e9e2935c1 Mon Sep 17 00:00:00 2001
-From: Brian Paul
-Date: Tue, 4 Sep 2012 20:17:15 -0600
-Subject: [PATCH 03/13] mesa: fix per-level max texture size error checking
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a long-standing omission in Mesa's texture image size checking.
-We need to take the mipmap level into consideration when checking if the
-width, height and depth are too large.
-
-Fixes the new piglit max-texture-size-level test.
-Thanks to Stéphane Marchesin for finding this problem.
-
-Note: This is a candidate for the stable branches.
-
-Reviewed-by: Michel Dänzer
-(cherry picked from commit 771e7b6d884bb4294a89f276a904d90b28efb90a)
----
- src/mesa/main/teximage.c | 36 +++++++++++++++++++++---------------
- 1 file changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 3aecc0f..ed22fa9 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -1251,11 +1251,12 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-
- switch (target) {
- case GL_PROXY_TEXTURE_1D:
-- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-- if (width < 2 * border || width > 2 * border + maxSize)
-- return GL_FALSE;
- if (level >= ctx->Const.MaxTextureLevels)
- return GL_FALSE;
-+ maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); /* level zero size */
-+ maxSize >>= level; /* level size */
-+ if (width < 2 * border || width > 2 * border + maxSize)
-+ return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1263,13 +1264,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_2D:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1279,15 +1281,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_3D:
-+ if (level >= ctx->Const.Max3DTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
- if (depth < 2 * border || depth > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.Max3DTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1299,23 +1302,24 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_RECTANGLE_NV:
-+ if (level != 0)
-+ return GL_FALSE;
- maxSize = ctx->Const.MaxTextureRectSize;
- if (width < 0 || width > maxSize)
- return GL_FALSE;
- if (height < 0 || height > maxSize)
- return GL_FALSE;
-- if (level != 0)
-- return GL_FALSE;
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-+ if (level >= ctx->Const.MaxCubeTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxCubeTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1325,13 +1329,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1339,15 +1344,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
- if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch b/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
deleted file mode 100644
index ff933b2ec284..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db8cb2250335a93cad6e877e634116e5cd6b42fc Mon Sep 17 00:00:00 2001
-From: Dave Airlie
-Date: Tue, 13 Mar 2012 14:53:25 +0000
-Subject: [PATCH 08/13] glsl: initialise const force glsl extension warning in
- fake ctx
-
-valgrind complained about an uninitialised value being used in
-glsl_parser_extras.cpp, and this was the one it was giving out about.
-
-Just initialise the value in the fakectx.
-
-Signed-off-by: Dave Airlie
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48057
-(cherry picked from commit b78a77f979b21a84aecb6fa4f19a2ed51a48c306)
----
- src/glsl/builtins/tools/generate_builtins.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
-index 72d12bb..bd15c4d 100755
---- a/src/glsl/builtins/tools/generate_builtins.py
-+++ b/src/glsl/builtins/tools/generate_builtins.py
-@@ -156,6 +156,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
- fakeCtx.API = API_OPENGL;
- fakeCtx.Const.GLSLVersion = 130;
- fakeCtx.Extensions.ARB_ES2_compatibility = true;
-+ fakeCtx.Const.ForceGLSLExtensionsWarn = false;
- gl_shader *sh = _mesa_new_shader(NULL, 0, target);
- struct _mesa_glsl_parse_state *st =
- new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch b/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
deleted file mode 100644
index 919443045e46..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2286bd68a832a4d4908d50e1a4496853e1f3305a Mon Sep 17 00:00:00 2001
-From: Brian Paul
-Date: Mon, 27 Aug 2012 21:52:07 -0600
-Subject: [PATCH 09/13] mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()
-
-To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
-(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
----
- src/mesa/main/attrib.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
-index 225ac89..cc384c7 100644
---- a/src/mesa/main/attrib.c
-+++ b/src/mesa/main/attrib.c
-@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
- _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
-
- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-+ if (ctx->Extensions.EXT_framebuffer_sRGB)
-+ _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
- }
- break;
- case GL_CURRENT_BIT:
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch b/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
deleted file mode 100644
index 565d5e6c2737..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9c50093adff0c7531ab32a7ec9ce3b91712b4d20 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 20 Jul 2013 10:25:28 -0700
-Subject: [PATCH 11/13] Apple: glFlush() is not needed with CGLFlushDrawable()
-
-
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit fa5ed99d8e809fb86e486a40273a4a6971055398)
----
- src/glx/apple/apple_glx.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
-index 56cff64..4e2aa33 100644
---- a/src/glx/apple/apple_glx.c
-+++ b/src/glx/apple/apple_glx.c
-@@ -132,8 +132,6 @@ apple_glx_swap_buffers(void *ptr)
- {
- struct apple_glx_context *ac = ptr;
-
-- /* This may not be needed with CGLFlushDrawable: */
-- glFlush();
- apple_cgl.flush_drawable(ac->context_obj);
- }
-
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch b/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
deleted file mode 100644
index 58ac66bd5511..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 629600450b3845a768c0edc92ea3f444d03a2738 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Tue, 20 May 2014 01:37:58 -0700
-Subject: [PATCH 12/13] glapi: Avoid heap corruption in _glapi_table
-
-Signed-off-by: Jeremy Huddleston Sequoia
-Reviewed-by: Chia-I Wu
-(cherry picked from commit ff5456d1acf6f627a6837be3f3f37c6a268c9e8e)
----
- src/mapi/glapi/gen/gl_gentable.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
-index 5657e32..0d0a02d 100644
---- a/src/mapi/glapi/gen/gl_gentable.py
-+++ b/src/mapi/glapi/gen/gl_gentable.py
-@@ -111,7 +111,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
-
- struct _glapi_table *
- _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
-- struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table));
-+ struct _glapi_table *disp = calloc(1, _glapi_get_dispatch_table_size() * sizeof(_glapi_proc));
- char symboln[512];
-
- if(!disp)
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch b/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
deleted file mode 100644
index 5ec0d9024eff..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ba59a779ed41e08fa16805c1c60da39885546d0e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Tue, 20 May 2014 10:53:00 -0700
-Subject: [PATCH 13/13] darwin: Fix test for kCGLPFAOpenGLProfile support at
- runtime
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 7a109268ab5b3544e7f7b99e84ef1fdf54023fb4)
----
- src/glx/apple/apple_visual.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 282934f..238c248 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -73,11 +73,15 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- GLint vsref = 0;
- CGLError error = 0;
-
-- /* Request an OpenGL 3.2 profile if one is available */
-- if(apple_cgl.version_major > 1 || (apple_cgl.version_major == 1 && apple_cgl.version_minor >= 3)) {
-- attr[numattr++] = kCGLPFAOpenGLProfile;
-- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-- }
-+ /* Request an OpenGL 3.2 profile if one is available and supported */
-+ attr[numattr++] = kCGLPFAOpenGLProfile;
-+ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+
-+ /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-+ attr[numattr] = 0;
-+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+ if (error == kCGLBadAttribute)
-+ numattr -= 2;
-
- if (offscreen) {
- apple_glx_diagnostic
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch b/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
deleted file mode 100644
index 372ce4a27a39..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
-From: Jon TURNEY
-Date: Mon, 12 May 2014 15:38:26 +0100
-Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
- CGLChoosePixelFormat() didn't find any matching pixel formats.
-
-Signed-off-by: Jon TURNEY
-Reviewed-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
----
- src/glx/apple/apple_visual.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 238c248..c6ede51 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
- abort();
- }
-+
-+ if (!*pfobj) {
-+ fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ abort();
-+ }
- }
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch b/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
deleted file mode 100644
index 4818ee63d4c9..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 24 May 2014 14:13:33 -0700
-Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
- to the crash log
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
----
- src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index c6ede51..951b213 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -63,6 +63,16 @@ enum
- MAX_ATTR = 60
- };
-
-+static char __crashreporter_info_buff__[4096] = { 0 };
-+static const char *__crashreporter_info__ __attribute__((__used__)) =
-+ &__crashreporter_info_buff__[0];
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+// This is actually a toolchain requirement, but I'm not sure the correct check,
-+// but it should be fine to just only include it for Leopard and later. This line
-+// just tells the linker to never strip this symbol (such as for space optimization)
-+__asm__ (".desc ___crashreporter_info__, 0x10");
-+#endif
-+
- void
- apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
- bool * double_buffered, bool * uses_stereo,
-@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-
- if (error) {
-- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
-+ fprintf(stderr, "%s", __crashreporter_info_buff__);
- abort();
- }
-
- if (!*pfobj) {
-- fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+ "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ fprintf(stderr, "%s", __crashreporter_info_buff__);
- abort();
- }
- }
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch b/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
deleted file mode 100644
index 72841e2a2cce..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 24 May 2014 14:08:16 -0700
-Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
- envvar
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
----
- src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 951b213..046581b 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- int numattr = 0;
- GLint vsref = 0;
- CGLError error = 0;
--
-- /* Request an OpenGL 3.2 profile if one is available and supported */
-- attr[numattr++] = kCGLPFAOpenGLProfile;
-- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--
-- /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-- attr[numattr] = 0;
-- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-- if (error == kCGLBadAttribute)
-- numattr -= 2;
-+ bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
-
- if (offscreen) {
- apple_glx_diagnostic
-@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- attr[numattr++] = mode->samples;
- }
-
-+ /* Debugging support for Core profiles to support newer versions of OpenGL */
-+ if (use_core_profile) {
-+ attr[numattr++] = kCGLPFAOpenGLProfile;
-+ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+ }
-+
- attr[numattr++] = 0;
-
- assert(numattr < MAX_ATTR);
-
- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-
-+ if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
-+ apple_glx_diagnostic
-+ ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
-+
-+ if (!error)
-+ apple_cgl.destroy_pixel_format(*pfobj);
-+
-+ numattr -= 3;
-+ attr[numattr++] = 0;
-+
-+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+ }
-+
- if (error) {
- snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
- "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff b/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
deleted file mode 100644
index e29a8464076d..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mapi/vgapi/Makefile 2012-11-30 12:06:24.000000000 -0500
-+++ b/src/mapi/vgapi/Makefile 2012-11-30 12:06:52.000000000 -0500
-@@ -75,6 +75,8 @@
- install-headers:
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/VG
- $(INSTALL) -m 644 $(TOP)/include/VG/*.h $(DESTDIR)$(INSTALL_INC_DIR)/VG
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-+ $(INSTALL) -m 644 $(TOP)/include/KHR/*.h $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-
- install: default install-headers install-pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
diff --git a/pkgs/development/libraries/mesa/darwin-clock-gettime.patch b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
new file mode 100644
index 000000000000..94e90a1c5871
--- /dev/null
+++ b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
@@ -0,0 +1,76 @@
+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
+index 45cb6075e6..62937311b9 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -36,6 +36,11 @@
+ #include
+ #include /* for intptr_t */
+
++#ifdef __MACH__
++#include
++#include
++#endif
++
+ /*
+ Configuration macro:
+
+@@ -383,12 +388,25 @@ tss_set(tss_t key, void *val)
+ /*-------------------- 7.25.7 Time functions --------------------*/
+ // 7.25.6.1
+ #ifndef HAVE_TIMESPEC_GET
++
+ static inline int
+ timespec_get(struct timespec *ts, int base)
+ {
+ if (!ts) return 0;
+ if (base == TIME_UTC) {
++#ifdef __MACH__
++ if (ts != NULL) {
++ clock_serv_t cclock;
++ mach_timespec_t mts;
++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++ clock_get_time(cclock, &mts);
++ mach_port_deallocate(mach_task_self(), cclock);
++ ts->tv_sec = mts.tv_sec;
++ ts->tv_nsec = mts.tv_nsec;
++ }
++#else
+ clock_gettime(CLOCK_REALTIME, ts);
++#endif
+ return base;
+ }
+ return 0;
+diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
+index 1208ebb315..e1378fb1f0 100644
+--- a/src/egl/drivers/dri2/egl_dri2.c
++++ b/src/egl/drivers/dri2/egl_dri2.c
+@@ -65,6 +65,11 @@
+ #include "util/u_vector.h"
+ #include "mapi/glapi/glapi.h"
+
++#ifdef __MACH__
++#include
++#include
++#endif
++
+ #define NUM_ATTRIBS 12
+
+ static void
+@@ -3092,7 +3097,17 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
+
+ /* We override the clock to monotonic when creating the condition
+ * variable. */
++#ifdef __MACH__
++ clock_serv_t cclock;
++ mach_timespec_t mts;
++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++ clock_get_time(cclock, &mts);
++ mach_port_deallocate(mach_task_self(), cclock);
++ current.tv_sec = mts.tv_sec;
++ current.tv_nsec = mts.tv_nsec;
++#else
+ clock_gettime(CLOCK_MONOTONIC, ¤t);
++#endif
+
+ /* calculating when to expire */
+ expire.tv_nsec = timeout % 1000000000L;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0a8a3c75a1c0..aca9a237b0c7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,6 +8,8 @@
, galliumDrivers ? null
, driDrivers ? null
, vulkanDrivers ? null
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, OpenGL, Xplugin
}:
/** Packaging design:
@@ -29,19 +31,21 @@ else
let
defaultGalliumDrivers =
- if stdenv.isAarch32
+ optionals (builtins.elem "drm" eglPlatforms)
+ (if stdenv.isAarch32
then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
else if stdenv.isAarch64
then ["virgl" "nouveau" "vc4" ]
- else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
+ else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
defaultDriDrivers =
- if (stdenv.isAarch32 || stdenv.isAarch64)
+ optionals (builtins.elem "drm" eglPlatforms)
+ (if (stdenv.isAarch32 || stdenv.isAarch64)
then ["nouveau"]
- else ["i915" "i965" "nouveau" "radeon" "r200"];
+ else ["i915" "i965" "nouveau" "radeon" "r200"]);
defaultVulkanDrivers =
- if (stdenv.isAarch32 || stdenv.isAarch64)
+ optionals stdenv.isLinux (if (stdenv.isAarch32 || stdenv.isAarch64)
then []
- else ["intel"] ++ lib.optional enableRadv "radeon";
+ else ["intel"] ++ lib.optional enableRadv "radeon");
in
let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
@@ -51,11 +55,11 @@ let
(if gallium_ == null
then defaultGalliumDrivers
else gallium_)
- ++ ["swrast" "virgl"];
+ ++ lib.optional stdenv.isLinux "swrast";
driDrivers =
(if dri_ == null
- then defaultDriDrivers
- else dri_) ++ ["swrast"];
+ then optionals (elem "drm" eglPlatforms) defaultDriDrivers
+ else dri_) ++ lib.optional stdenv.isLinux "swrast";
vulkanDrivers =
if vulkan_ == null
then defaultVulkanDrivers
@@ -63,7 +67,7 @@ let
in
let
- version = "18.1.7";
+ version = "18.2.1";
branch = head (splitString "." version);
in
@@ -77,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306";
+ sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
};
prePatch = "patchShebangs .";
@@ -89,9 +93,10 @@ let self = stdenv.mkDerivation {
./symlink-drivers.patch
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
./disk_cache-include-dri-driver-path-in-cache-key.patch
- ];
+ ] ++ lib.optional stdenv.isDarwin ./darwin-clock-gettime.patch;
- outputs = [ "out" "dev" "drivers" "osmesa" ];
+ outputs = [ "out" "dev" "drivers" ]
+ ++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
# TODO: Figure out how to enable opencl without having a runtime dependency on clang
configureFlags = [
@@ -99,19 +104,11 @@ let self = stdenv.mkDerivation {
"--localstatedir=/var"
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
- "--with-platforms=x11,wayland,drm"
+ "--with-platforms=${concatStringsSep "," eglPlatforms}"
+ "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}"
+ "--with-dri-drivers=${concatStringsSep "," driDrivers}"
+ "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}"
"--enable-texture-float"
- ]
- ++ (optional (galliumDrivers != [])
- ("--with-gallium-drivers=" +
- builtins.concatStringsSep "," galliumDrivers))
- ++ (optional (driDrivers != [])
- ("--with-dri-drivers=" +
- builtins.concatStringsSep "," driDrivers))
- ++ (optional (vulkanDrivers != [])
- ("--with-vulkan-drivers=" +
- builtins.concatStringsSep "," vulkanDrivers))
- ++ [
(enableFeature stdenv.isLinux "dri3")
(enableFeature stdenv.isLinux "nine") # Direct3D in Wine
"--enable-libglvnd"
@@ -122,17 +119,18 @@ let self = stdenv.mkDerivation {
"--enable-glx"
# https://bugs.freedesktop.org/show_bug.cgi?id=35268
(enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
- "--enable-gallium-osmesa" # used by wine
+ # used by wine
+ (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa")
"--enable-llvm"
- "--enable-egl"
- "--enable-xa" # used in vmware driver
- "--enable-gbm"
+ (enableFeature stdenv.isLinux "egl")
+ (enableFeature stdenv.isLinux "xa") # used in vmware driver
+ (enableFeature stdenv.isLinux "gbm")
"--enable-xvmc"
"--enable-vdpau"
"--enable-shared-glapi"
"--enable-llvm-shared-libs"
- "--enable-omx-bellagio"
- "--enable-va"
+ (enableFeature stdenv.isLinux "omx-bellagio")
+ (enableFeature stdenv.isLinux "va")
"--disable-opencl"
];
@@ -140,16 +138,18 @@ let self = stdenv.mkDerivation {
propagatedBuildInputs = with xorg;
[ libXdamage libXxf86vm ]
- ++ optional stdenv.isLinux libdrm;
+ ++ optional stdenv.isLinux libdrm
+ ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
buildInputs = with xorg; [
expat llvmPackages.llvm libglvnd
glproto dri2proto dri3proto presentproto
- libX11 libXext libxcb libXt libXfixes libxshmfence
- libffi wayland wayland-protocols libvdpau libelf libXvMC
- libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/
+ libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
+ libffi libvdpau libelf libXvMC
+ libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light python2 python2.pkgs.Mako
- ];
+ ] ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols
+ libomxil-bellagio libva-minimal ];
enableParallelBuilding = true;
doCheck = false;
@@ -161,7 +161,7 @@ let self = stdenv.mkDerivation {
];
# TODO: probably not all .la files are completely fixed, but it shouldn't matter;
- postInstall = ''
+ postInstall = optionalString (galliumDrivers != []) ''
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
mv -t "$drivers/lib/" \
$out/lib/libXvMC* \
@@ -215,7 +215,7 @@ let self = stdenv.mkDerivation {
# TODO:
# check $out doesn't depend on llvm: builder failures are ignored
# for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
- postFixup = ''
+ postFixup = optionalString (galliumDrivers != []) ''
# add RPATH so the drivers can find the moved libgallium and libdricore9
# moved here to avoid problems with stripping patchelfed files
for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
@@ -235,7 +235,9 @@ let self = stdenv.mkDerivation {
# Use stub libraries from libglvnd and headers from Mesa.
buildCommand = ''
- ln -s ${libglvnd.out} $out
+ mkdir -p $out/nix-support
+ ln -s ${libglvnd.out}/lib $out/lib
+
mkdir -p $dev/{,lib/pkgconfig,nix-support}
echo "$out" > $dev/nix-support/propagated-build-inputs
ln -s ${self.dev}/include $dev/include
@@ -257,6 +259,8 @@ let self = stdenv.mkDerivation {
genPkgConfig egl EGL
genPkgConfig glesv1_cm GLESv1_CM
genPkgConfig glesv2 GLESv2
+ '' + lib.optionalString stdenv.isDarwin ''
+ echo ${OpenGL} > $out/nix-support/propagated-build-inputs
'';
};
};
@@ -265,7 +269,7 @@ let self = stdenv.mkDerivation {
description = "An open source implementation of OpenGL";
homepage = https://www.mesa3d.org/;
license = licenses.mit; # X11 variant, in most files
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ vcunat ];
};
};
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index feb6ffe428c0..18e7d5437b15 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -32,16 +32,6 @@
#include
#include
#else
---- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
- #include "util/u_atomic.h"
- #include "util/list.h"
-
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index a10f52462a8e..1a5656b7ca16 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -22,10 +22,9 @@ stdenv.mkDerivation rec {
unset CPP
'';
- # Use `lib.optionalString` next mass rebuild.
- makeFlags = if stdenv.buildPlatform == stdenv.hostPlatform
- then null
- else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
+ makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ];
meta = with stdenv.lib; {
homepage = https://fedorahosted.org/newt/;
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ce18498ee858..9cb7d701b9da 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl
, CoreServices ? null }:
-let version = "4.19"; in
+let version = "4.20"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
+ sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/parquet-cpp/api.patch b/pkgs/development/libraries/parquet-cpp/api.patch
new file mode 100644
index 000000000000..3fd567ea098f
--- /dev/null
+++ b/pkgs/development/libraries/parquet-cpp/api.patch
@@ -0,0 +1,12 @@
+diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
+--- a/src/parquet/arrow/reader.cc
++++ b/src/parquet/arrow/reader.cc
+@@ -1421,7 +1421,7 @@ Status StructImpl::DefLevelsToNullArray(std::shared_ptr* null_bitmap_out
+ const int16_t* def_levels_data;
+ size_t def_levels_length;
+ RETURN_NOT_OK(GetDefLevels(&def_levels_data, &def_levels_length));
+- RETURN_NOT_OK(AllocateEmptyBitmap(pool_, def_levels_length, &null_bitmap));
++ RETURN_NOT_OK(GetEmptyBitmap(pool_, def_levels_length, &null_bitmap));
+ uint8_t* null_bitmap_ptr = null_bitmap->mutable_data();
+ for (size_t i = 0; i < def_levels_length; i++) {
+ if (def_levels_data[i] < struct_def_level_) {
diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix
index e281e604380b..804ddb136f03 100644
--- a/pkgs/development/libraries/parquet-cpp/default.nix
+++ b/pkgs/development/libraries/parquet-cpp/default.nix
@@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
name = "parquet-cpp-${version}";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchurl {
url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz";
- sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj";
+ sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli";
};
+ patches = [ ./api.patch ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index f7ddf8ff780c..8715aaaa44d0 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
./parallel-configure.patch
./clang-5-darwin.patch
./qt-4.8.7-unixmake-darwin.patch
+ ./kill-legacy-darwin-apis.patch
(substituteAll {
src = ./dlopen-absolute-paths.diff;
cups = if cups != null then lib.getLib cups else null;
diff --git a/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
new file mode 100644
index 000000000000..c1338e98d851
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
@@ -0,0 +1,330 @@
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 4a9049b..c0ac9db 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -242,9 +242,8 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+ #else
+ char *ret = 0;
+ # if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
+- // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation,
+- // which does not work properly with the realpath(X,0) form. See QTBUG-28282.
+- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
++ // In Nix-on-Darwin, we don't support ancient macOS anyway, and the deleted branch relies on
++ // a symbol that's been deprecated for years and that our CF doesn't have
+ ret = (char*)malloc(PATH_MAX + 1);
+ if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
+ const int savedErrno = errno; // errno is checked below, and free() might change it
+@@ -252,19 +251,6 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+ errno = savedErrno;
+ ret = 0;
+ }
+- } else {
+- // on 10.5 we can use FSRef to resolve the file path.
+- QString path = QDir::cleanPath(entry.filePath());
+- FSRef fsref;
+- if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) {
+- CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref);
+- CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
+- QString ret = QCFString::toQString(canonicalPath);
+- CFRelease(canonicalPath);
+- CFRelease(urlref);
+- return QFileSystemEntry(ret);
+- }
+- }
+ # else
+ # if _POSIX_VERSION >= 200801L
+ ret = realpath(entry.nativeFilePath().constData(), (char*)0);
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+index 3bf7342..b6bcfc0 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+@@ -43,7 +43,6 @@ BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second);
+ BOOL hasCaseInsensitiveSuffix(NSString *string, NSString *suffix);
+ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring);
+ NSString *filenameByFixingIllegalCharacters(NSString *string);
+-CFStringEncoding stringEncodingForResource(Handle resource);
+
+ #ifdef __cplusplus
+ }
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+index d6c3f0c..c88ca76 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+@@ -68,45 +68,4 @@ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring)
+ return filename;
+ }
+
+-CFStringEncoding stringEncodingForResource(Handle resource)
+-{
+- short resRef = HomeResFile(resource);
+- if (ResError() != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- // Get the FSRef for the current resource file
+- FSRef fref;
+- OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- RetainPtr url(AdoptCF, CFURLCreateFromFSRef(NULL, &fref));
+- if (!url)
+- return NSMacOSRomanStringEncoding;
+-
+- NSString *path = [(NSURL *)url.get() path];
+-
+- // Get the lproj directory name
+- path = [path stringByDeletingLastPathComponent];
+- if (!stringIsCaseInsensitiveEqualToString([path pathExtension], @"lproj"))
+- return NSMacOSRomanStringEncoding;
+-
+- NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent];
+- RetainPtr locale(AdoptCF, CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName));
+- if (!locale)
+- return NSMacOSRomanStringEncoding;
+-
+- LangCode lang;
+- RegionCode region;
+- error = LocaleStringToLangAndRegionCodes([(NSString *)locale.get() UTF8String], &lang, ®ion);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- TextEncoding encoding;
+- error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- return encoding;
+-}
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+index 865ea32..20bda8d 100644
+--- a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+@@ -101,33 +101,6 @@ static WTF::RetainPtr readPListFile(CFStringRef fileName, bool
+ return map;
+ }
+
+-static Vector stringListFromResourceId(SInt16 id)
+-{
+- Vector list;
+-
+- Handle handle = Get1Resource('STR#', id);
+- if (!handle)
+- return list;
+-
+- CFStringEncoding encoding = stringEncodingForResource(handle);
+-
+- unsigned char* p = (unsigned char*)*handle;
+- if (!p)
+- return list;
+-
+- SInt16 count = *(SInt16*)p;
+- p += sizeof(SInt16);
+-
+- for (SInt16 i = 0; i < count; ++i) {
+- unsigned char length = *p;
+- WTF::RetainPtr str = CFStringCreateWithPascalString(0, p, encoding);
+- list.append(str.get());
+- p += 1 + length;
+- }
+-
+- return list;
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+ if (!load())
+@@ -202,36 +175,8 @@ bool PluginPackage::fetchInfo()
+ m_description = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginDescription"));
+
+ } else {
+- int resFile = CFBundleOpenBundleResourceMap(m_module);
+-
+- UseResFile(resFile);
+-
+- Vector mimes = stringListFromResourceId(MIMEListStringStringNumber);
+-
+- if (mimes.size() % 2 != 0)
+- return false;
+-
+- Vector descriptions = stringListFromResourceId(MIMEDescriptionStringNumber);
+- if (descriptions.size() != mimes.size() / 2)
+- return false;
+-
+- for (size_t i = 0; i < mimes.size(); i += 2) {
+- String mime = mimes[i].lower();
+- Vector extensions;
+- mimes[i + 1].lower().split(UChar(','), extensions);
+-
+- m_mimeToExtensions.set(mime, extensions);
+-
+- m_mimeToDescriptions.set(mime, descriptions[i / 2]);
+- }
+-
+- Vector names = stringListFromResourceId(PluginNameOrDescriptionStringNumber);
+- if (names.size() == 2) {
+- m_description = names[0];
+- m_name = names[1];
+- }
+-
+- CFBundleCloseBundleResourceMap(m_module, resFile);
++ LOG(Plugins, "Nix removed ancient code that relies on long-deprecated functionality that we don't want to support!");
++ return false;
+ }
+
+ LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
+diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+index b206e48..669d442 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+@@ -26,7 +26,6 @@
+ #import "config.h"
+ #import "NetscapePluginModule.h"
+
+-#import
+ #import
+
+ using namespace WebCore;
+@@ -196,132 +195,6 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& plugi
+ return true;
+ }
+
+-class ResourceMap {
+-public:
+- explicit ResourceMap(CFBundleRef bundle)
+- : m_bundle(bundle)
+- , m_currentResourceFile(CurResFile())
+- , m_bundleResourceMap(CFBundleOpenBundleResourceMap(m_bundle))
+- {
+- UseResFile(m_bundleResourceMap);
+- }
+-
+- ~ResourceMap()
+- {
+- // Close the resource map.
+- CFBundleCloseBundleResourceMap(m_bundle, m_bundleResourceMap);
+-
+- // And restore the old resource.
+- UseResFile(m_currentResourceFile);
+- }
+-
+- bool isValid() const { return m_bundleResourceMap != -1; }
+-
+-private:
+- CFBundleRef m_bundle;
+- ResFileRefNum m_currentResourceFile;
+- ResFileRefNum m_bundleResourceMap;
+-};
+-
+-static bool getStringListResource(ResID resourceID, Vector& stringList) {
+- Handle stringListHandle = Get1Resource('STR#', resourceID);
+- if (!stringListHandle || !*stringListHandle)
+- return false;
+-
+- // Get the string list size.
+- Size stringListSize = GetHandleSize(stringListHandle);
+- if (stringListSize < static_cast(sizeof(UInt16)))
+- return false;
+-
+- CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
+-
+- unsigned char* ptr = reinterpret_cast(*stringListHandle);
+- unsigned char* end = ptr + stringListSize;
+-
+- // Get the number of strings in the string list.
+- UInt16 numStrings = *reinterpret_cast(ptr);
+- ptr += sizeof(UInt16);
+-
+- for (UInt16 i = 0; i < numStrings; ++i) {
+- // We're past the end of the string, bail.
+- if (ptr >= end)
+- return false;
+-
+- // Get the string length.
+- unsigned char stringLength = *ptr++;
+-
+- RetainPtr cfString(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, ptr, stringLength, stringEncoding, false, kCFAllocatorNull));
+- if (!cfString.get())
+- return false;
+-
+- stringList.append(cfString.get());
+- ptr += stringLength;
+- }
+-
+- if (ptr != end)
+- return false;
+-
+- return true;
+-}
+-
+-static const ResID PluginNameOrDescriptionStringNumber = 126;
+-static const ResID MIMEDescriptionStringNumber = 127;
+-static const ResID MIMEListStringStringNumber = 128;
+-
+-static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo)
+-{
+- ResourceMap resourceMap(bundle);
+- if (!resourceMap.isValid())
+- return false;
+-
+- // Get the description and name string list.
+- Vector descriptionAndName;
+- if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName))
+- return false;
+-
+- // Get the MIME types and extensions string list. This list needs to be a multiple of two.
+- Vector mimeTypesAndExtensions;
+- if (!getStringListResource(MIMEListStringStringNumber, mimeTypesAndExtensions))
+- return false;
+-
+- if (mimeTypesAndExtensions.size() % 2)
+- return false;
+-
+- // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types.
+- Vector mimeTypeDescriptions;
+- if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions))
+- return false;
+-
+- // Add all MIME types.
+- for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) {
+- MimeClassInfo mimeClassInfo;
+-
+- const String& mimeType = mimeTypesAndExtensions[i * 2];
+- String description;
+- if (i < mimeTypeDescriptions.size())
+- description = mimeTypeDescriptions[i];
+-
+- mimeClassInfo.type = mimeType.lower();
+- mimeClassInfo.desc = description;
+-
+- Vector extensions;
+- mimeTypesAndExtensions[i * 2 + 1].split(',', extensions);
+-
+- for (size_t i = 0; i < extensions.size(); ++i)
+- mimeClassInfo.extensions.append(extensions[i].lower());
+-
+- pluginInfo.mimes.append(mimeClassInfo);
+- }
+-
+- // Set the description and name if they exist.
+- if (descriptionAndName.size() > 0)
+- pluginInfo.desc = descriptionAndName[0];
+- if (descriptionAndName.size() > 1)
+- pluginInfo.name = descriptionAndName[1];
+-
+- return true;
+-}
+-
+ bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
+ {
+ RetainPtr bundlePath(AdoptCF, pluginPath.createCFString());
+@@ -344,8 +217,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
+ return false;
+
+ // Check that there's valid info for this plug-in.
+- if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) &&
+- !getPluginInfoFromCarbonResources(bundle.get(), plugin.info))
++ if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info))
+ return false;
+
+ plugin.path = pluginPath;
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
index 4446226fedef..d0a15e866f7a 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/pkgs/development/libraries/rarian/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.gz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz";
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index a84cb7623d8f..b050a19db37b 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -79,12 +79,12 @@ let
in
stdenv.mkDerivation rec {
name = "openblas-${version}";
- version = "0.3.1";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
- sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
+ sha256 = "0cpkvfvc14xm9mifrm919rp8vrq70gpl7r2sww4f0izrl39wklwx";
};
inherit blas64;
@@ -118,20 +118,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
++ mapAttrsToList (var: val: var + "=" + val) config;
- patches = [
- # Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
- # is causing problems and was already accepted upstream.
- (fetchpatch {
- url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
- sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
- })
- # Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
- # https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
- (fetchpatch {
- url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
- sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
- })
- ];
+ patches = [];
doCheck = true;
checkTarget = "tests";
@@ -140,7 +127,7 @@ stdenv.mkDerivation rec {
# Write pkgconfig aliases. Upstream report:
# https://github.com/xianyi/OpenBLAS/issues/1740
for alias in blas cblas lapack; do
- cat < $out/lib/pkgconfig/openblas-$alias.pc
+ cat < $out/lib/pkgconfig/$alias.pc
Name: $alias
Version: ${version}
Description: $alias provided by the OpenBLAS package.
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index fc9abdc24c7c..c903b041fd4d 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sundials";
- version = "3.1.2";
+ version = "3.2.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658";
+ sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index e2a2af615b88..7f46702c2e8c 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "Vc-${version}";
- version = "1.3.3";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "VcDevel";
repo = "Vc";
rev = version;
- sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m";
+ sha256 = "1jwwp3g8pqngdakqy3dxy3vgzh0gla5wvwqqlfvqdgsw6455xhm7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index a94f2745894b..d7dd2d1190d8 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -20,6 +20,7 @@
, bundleId ? null
, version ? null
, title ? null
+, meta ? {}
}:
assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null;
@@ -49,6 +50,7 @@ in
stdenv.mkDerivation {
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
+ inherit meta;
buildInputs = [ xcodewrapper ];
buildPhase = ''
${stdenv.lib.optionalString release ''
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 0144400859ab..020992c86844 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -16,6 +16,10 @@ nodePackages // {
'';
};
+ jshint = nodePackages.jshint.override {
+ buildInputs = [ pkgs.phantomjs2 ];
+ };
+
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
@@ -103,4 +107,8 @@ nodePackages // {
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};
+ webtorrent-cli = nodePackages.webtorrent-cli.override {
+ buildInputs = [ nodePackages.node-gyp-build ];
+ };
+
}
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 53c45d17854c..5e156776f860 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo }:
stdenv.mkDerivation rec {
- version = "0.8.7";
+ version = "1.0.1";
name = "ocaml${ocaml.version}-camomile-${version}";
src = fetchFromGitHub {
owner = "yoriyuki";
repo = "camomile";
- rev = "rel-${version}";
- sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
+ rev = "${version}";
+ sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
};
buildInputs = [ ocaml findlib dune cppo ];
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index c7baa87a3314..6be1595f7c59 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
stdenv.mkDerivation rec {
- version = "0.6.13";
+ version = "0.6.14";
name = "piqi-${version}";
src = fetchurl {
url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
- sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
+ sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
};
buildInputs = [ ocaml findlib which ocaml_optcomp ];
propagatedBuildInputs = [ulex xmlm easy-format base64];
- patches = [ ./no-ocamlpath-override.patch ./safe-string.patch ];
+ patches = [ ./no-ocamlpath-override.patch ];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/piqi/safe-string.patch b/pkgs/development/ocaml-modules/piqi/safe-string.patch
deleted file mode 100644
index fbc2864d5348..000000000000
--- a/pkgs/development/ocaml-modules/piqi/safe-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/piqilib/piqi_json_parser.mll
-+++ b/piqilib/piqi_json_parser.mll
-@@ -189,8 +189,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
- let s = lexbuf.lex_buffer in
- let start = lexbuf.lex_start_pos in
-- check_adjust_utf8 v lexbuf s start len;
-- Buffer.add_substring v.buf s start len
-+ check_adjust_utf8 v lexbuf (Bytes.unsafe_to_string s) start len;
-+ Buffer.add_subbytes v.buf s start len
-
- let map_lexeme f lexbuf =
- let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 87a337a154dd..04aa9411247e 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -21,7 +21,9 @@ buildPythonPackage rec {
(stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
checkPhase = ''
+ runHook preCheck
USE_TWISTED=true py.test $out
+ runHook postCheck
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
new file mode 100644
index 000000000000..6e2e703dd569
--- /dev/null
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
+
+buildPythonPackage rec {
+ pname = "btchip-python";
+ version = "0.1.28";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "10yxwlsr99gby338rsnczkfigcy36fiajpkr6f44438qlvbx02fs";
+ };
+
+ propagatedBuildInputs = [ hidapi pyscard ecdsa ];
+
+ # tests requires hardware
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python communication library for Ledger Hardware Wallet products";
+ homepage = "https://github.com/LedgerHQ/btchip-python";
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 39634b8d293a..b5cb017956c4 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,7 +1,10 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
numpy, django_colorful, pillow, psycopg2,
- pyparsing, django_2_1, celery, boto3
+ pyparsing, django, celery, boto3
}:
+if stdenv.lib.versionOlder django.version "2.0"
+then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
+else
buildPythonPackage rec {
version = "0.6";
pname = "django-raster";
@@ -17,7 +20,7 @@ buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
- pyparsing django_2_1 celery boto3 ];
+ pyparsing django celery boto3 ];
meta = with stdenv.lib; {
description = "Basic raster data integration for Django";
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index af8815dbfb1b..c66650c0abf2 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -11,7 +11,8 @@ buildPythonPackage rec {
};
disabled = isPyPy;
- buildInputs = [ gfortran pytest blas ];
+ nativeBuildInputs = [ gfortran pytest ];
+ buildInputs = [ blas ];
patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 1c2cb4a7643d..e73b1717331c 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
let
_arrow-cpp = arrow-cpp.override { inherit python;};
@@ -7,18 +7,14 @@ in
buildPythonPackage rec {
pname = "pyarrow";
- version = "0.9.0";
- src = fetchurl {
- url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
- };
+ inherit (_arrow-cpp) version src;
sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
- checkInputs = [ pandas pytest pytestrunner ];
+ checkInputs = [ pandas pytest pytestrunner JPype1 ];
PYARROW_BUILD_TYPE = "release";
PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib";
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 035c70f3995a..d6b966b6df3c 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -11,6 +11,41 @@
, glibcLocales
}:
+with stdenv.lib;
+
+
+let
+ # https://github.com/pyca/pyopenssl/issues/791
+ # These tests, we disable in the case that libressl is passed in as openssl.
+ failingLibresslTests = [
+ "test_op_no_compression"
+ "test_npn_advertise_error"
+ "test_npn_select_error"
+ "test_npn_client_fail"
+ "test_npn_success"
+ "test_use_certificate_chain_file_unicode"
+ "test_use_certificate_chain_file_bytes"
+ "test_add_extra_chain_cert"
+ "test_set_session_id_fail"
+ "test_verify_with_revoked"
+ "test_set_notAfter"
+ "test_set_notBefore"
+ ];
+
+ disabledTests = [
+ # https://github.com/pyca/pyopenssl/issues/692
+ # These tests, we disable always.
+ "test_set_default_verify_paths"
+ "test_fallback_default_verify_paths"
+ ] ++ (optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests);
+
+ # Compose the final string expression, including the "-k" and the single quotes.
+ testExpression = optionalString (disabledTests != [])
+ "-k 'not ${concatStringsSep " and not " disabledTests}'";
+
+in
+
+
buildPythonPackage rec {
pname = "pyOpenSSL";
version = "18.0.0";
@@ -22,16 +57,10 @@ buildPythonPackage rec {
outputs = [ "out" "dev" ];
- preCheck = ''
- sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py
- # https://github.com/pyca/pyopenssl/issues/692
- sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py
- '';
-
checkPhase = ''
runHook preCheck
export LANG="en_US.UTF-8"
- py.test
+ py.test tests ${testExpression}
runHook postCheck
'';
@@ -43,4 +72,4 @@ buildPythonPackage rec {
propagatedBuildInputs = [ cryptography pyasn1 idna ];
checkInputs = [ pytest pretend flaky glibcLocales ];
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 3770f62f1a5b..6146159ad0ab 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,9 +29,11 @@ buildPythonPackage rec {
# Remove .pytest_cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
- postFixupHooks+=(
- 'find $out -name .pytest_cache -type d -exec rm -rf {} +'
- )
+ pytestcachePhase() {
+ find $out -name .pytest_cache -type d -exec rm -rf {} +
+ }
+
+ preDistPhases+=" pytestcachePhase"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index d31719efa172..7d56f1990a52 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -42,6 +42,22 @@ in buildPythonPackage rec {
export CUDNN_INCLUDE_DIR=${cudnn}/include
'';
+ preFixup = ''
+ function join_by { local IFS="$1"; shift; echo "$*"; }
+ function strip2 {
+ IFS=':'
+ read -ra RP <<< $(patchelf --print-rpath $1)
+ IFS=' '
+ RP_NEW=$(join_by : ''${RP[@]:2})
+ patchelf --set-rpath \$ORIGIN:''${RP_NEW} "$1"
+ }
+
+ for f in $(find ''${out} -name 'libcaffe2*.so')
+ do
+ strip2 $f
+ done
+ '';
+
buildInputs = [
cmake
numpy.blas
@@ -56,7 +72,7 @@ in buildPythonPackage rec {
] ++ lib.optional (pythonOlder "3.5") typing;
checkPhase = ''
- ${cudaStubEnv}python test/run_test.py --exclude distributed autograd distributions jit sparse torch utils nn
+ ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils
'';
meta = {
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 140e8cc80b4d..5fdffedc6f27 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -10,7 +10,8 @@ buildPythonPackage rec {
};
checkInputs = [ nose pytest ];
- buildInputs = [ gfortran numpy.blas ];
+ nativeBuildInputs = [ gfortran ];
+ buildInputs = [ numpy.blas ];
propagatedBuildInputs = [ numpy ];
# Remove tests because of broken wrapper
diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix
new file mode 100644
index 000000000000..ee9444fd38ec
--- /dev/null
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+ pname = "simple-websocket-server";
+ version = "20180414";
+ src = fetchFromGitHub {
+ owner = "dpallot";
+ repo = "simple-websocket-server";
+ rev = "34e6def93502943d426fb8bb01c6901341dd4fe6";
+ sha256 = "19rcpdx4vxg9is1cpyh9m9br5clyzrpb7gyfqsl0g3im04m098n5";
+ };
+
+ doCheck = false; # no tests
+
+ meta = with stdenv.lib; {
+ description = "A python based websocket server that is simple and easy to use";
+ homepage = https://github.com/dpallot/simple-websocket-server/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ rvolosatovs ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 89addb377dc4..ab816cde8355 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "trio";
- version = "0.6.0";
+ version = "0.7.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7a80c10b89068950aa649edd4b09a6f56236642c2c2e648b956289d2301fdb9e";
+ sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n";
};
checkInputs = [ pytest pyopenssl trustme ];
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 3ed7fa640500..9c535d90e919 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "yapf";
- version = "0.22.0";
+ version = "0.24.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63";
+ sha256 = "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 5734a0f27953..ccc2cf9b4ab5 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl gdb ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
enableParallelBuilding = true;
+ separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString stdenv.isDarwin (
let OSRELEASE = ''
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
new file mode 100644
index 000000000000..bedb55ec3742
--- /dev/null
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -0,0 +1,80 @@
+{ buildBazelPackage
+, cacert
+, fetchFromGitHub
+, fetchpatch
+, git
+, go
+, stdenv
+}:
+
+buildBazelPackage rec {
+ name = "bazel-watcher-${version}";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "bazel-watcher";
+ rev = "v${version}";
+ sha256 = "1sis723hwax4dg0c28x20yj0hjli66q1ykcvjirgy57znz4iwlq9";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/bazelbuild/bazel-watcher/commit/4d5928eee3dd5843a1b55136d914b78fef7f25d0.patch";
+ sha256 = "0gxzcdqgifrmvznfy0p5nd11b39n2pwxcvpmhc6hxf85mwlxz7dg";
+ })
+
+ ./update-gazelle-fix-ssl.patch
+ ];
+
+ nativeBuildInputs = [ go git ];
+
+ bazelTarget = "//ibazel";
+
+ fetchAttrs = {
+ preBuild = ''
+ patchShebangs .
+
+ # tell rules_go to use the Go binary found in the PATH
+ sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
+
+ # tell rules_go to invoke GIT with custom CAINFO path
+ export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
+ '';
+
+ preInstall = ''
+ # Remove the go_sdk (it's just a copy of the go derivation) and all
+ # references to it from the marker files. Bazel does not need to download
+ # this sdk because we have patched the WORKSPACE file to point to the one
+ # currently present in PATH. Without removing the go_sdk from the marker
+ # file, the hash of it will change anytime the Go derivation changes and
+ # that would lead to impurities in the marker files which would result in
+ # a different sha256 for the fetch phase.
+ rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
+ sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
+ '';
+
+ sha256 = "1iyjvibvlwg980p7nizr6x5v31dyp4a344f0xn839x393583k59d";
+ };
+
+ buildAttrs = {
+ preBuild = ''
+ patchShebangs .
+
+ # tell rules_go to use the Go binary found in the PATH
+ sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
+ '';
+
+ installPhase = ''
+ install -Dm755 bazel-bin/ibazel/*_pure_stripped/ibazel $out/bin/ibazel
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/bazelbuild/bazel-watcher;
+ description = "Tools for building Bazel targets when source files change.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch b/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
new file mode 100644
index 000000000000..4cf69e9d1723
--- /dev/null
+++ b/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
@@ -0,0 +1,19 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 4011d9b..d085ae8 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -52,11 +52,9 @@ http_archive(
+
+ http_archive(
+ name = "bazel_gazelle",
+- sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b",
+- urls = [
+- "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
+- "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
+- ],
++ sha256 = "0600ea2daf98170211dc561fd348a8a9328c91eb6df66a381eaaf0bcd122e80b",
++ strip_prefix = "bazel-gazelle-b34f46af2f31ee0470e7364352c2376bcc10d079",
++ url = "https://github.com/bazelbuild/bazel-gazelle/archive/b34f46af2f31ee0470e7364352c2376bcc10d079.tar.gz",
+ )
+
+ load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index b1df54f9bd5c..bb08ae2f3af5 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+{ stdenv, fetchFromGitHub, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "ninja-${version}";
@@ -11,10 +13,11 @@ stdenv.mkDerivation rec {
sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
};
- nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
+ nativeBuildInputs = [ python ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
buildPhase = ''
python configure.py --bootstrap
+ '' + optionalString buildDocs ''
# "./ninja -vn manual" output copied here to support cross compilation.
asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
@@ -22,14 +25,15 @@ stdenv.mkDerivation rec {
installPhase = ''
install -Dm555 -t $out/bin ninja
- install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
install -Dm444 misc/bash-completion $out/share/bash-completion/completions/ninja
install -Dm444 misc/zsh-completion $out/share/zsh/site-functions/_ninja
+ '' + optionalString buildDocs ''
+ install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
'';
setupHook = ./setup-hook.sh;
- meta = with stdenv.lib; {
+ meta = {
description = "Small build system with a focus on speed";
longDescription = ''
Ninja is a small build system with a focus on speed. It differs from
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index d501a7953841..5cb5bbacee95 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
let
- rev = "3c8fcadc3376edfd8e4b08b35f174935bf97bbac";
- version = stdenv.lib.strings.substring 0 7 rev;
+ rev = "1d8ee2c0a75374afa1cb687f450aeb095180882b";
+ version = "2018-09-27";
in
stdenv.mkDerivation {
name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "0r79w4kgdrsdnm4ma9rmb9k115rvidpaha7sr9rsxv68jpagwgrj";
+ sha256 = "1a6k1lcpd9sknzyx6niq56z1b90mz7br7y13yk98w06r7fmfchw5";
};
dontBuild = true;
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 9fb7c0e64b80..02d5adb0c34d 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchurl, crystal, libyaml, which }:
+{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
stdenv.mkDerivation rec {
name = "shards-${version}";
version = "0.8.1";
- src = fetchurl {
- url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
- sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm";
+ src = fetchFromGitHub {
+ owner = "crystal-lang";
+ repo = "shards";
+ rev = "v${version}";
+ sha256 = "1cjn2lafr08yiqzlhyqx14jjjxf1y24i2kk046px07gljpnlgqwk";
};
- buildInputs = [ crystal libyaml which ];
+ buildInputs = [ crystal libyaml pcre which ];
buildFlags = [ "CRFLAGS=--release" ];
installPhase = ''
- mkdir -p $out/bin
- cp bin/shards $out/bin/
+ runHook preInstall
+
+ install -Dm755 bin/shards $out/bin/shards
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
- homepage = https://crystal-lang.org/;
- license = licenses.asl20;
description = "Dependency manager for the Crystal language";
- maintainers = with maintainers; [ sifmelcara ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ license = licenses.asl20;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (crystal.meta) homepage platforms;
};
}
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 203e140b369e..9981bca3b68e 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.3.0";
+ version = "11.3.1";
# 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 = "1xl48lrycwy4d7h83ydp9gj27d9mhbpa4xrd1bn7i3ad9lrn7xjz";
+ sha256 = "13w8fjjc087klracv4ggjifj08vx3b549mhy220r5wn9aga5m549";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "0afjg4hv9iy80anl5h7cnjdxzk4zrkj2zn3f4qsl9rf7354ik1zj";
+ sha256 = "10s2g6mqy7p5dmjmlxggsfqqqf4bfrqjri7m2nd11l1lf4mmr2kk";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0p992mm8zz30nx0q076g0waqvfknn05wyyr1n1sxglbh9nmym157";
+ sha256 = "1k978zsvsvr7ys18zqjg6n45cwi3nj0919fwj442dv99s95zyf6s";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
index 8f71f9ed630c..8aa419ea5f94 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
@@ -1,16 +1,16 @@
diff --git a/shells/bash.go b/shells/bash.go
-index 839b7781..2b478e1e 100644
+index 673f4765..a58cc5e2 100644
--- a/shells/bash.go
+++ b/shells/bash.go
-@@ -7,6 +7,7 @@ import (
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+@@ -5,6 +5,7 @@ import (
+ "bytes"
+ "fmt"
"io"
+ "os/exec"
"path"
"runtime"
"strconv"
-@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
+@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
@@ -22,4 +22,7 @@ index 839b7781..2b478e1e 100644
+ script.Arguments = append(script.Arguments, "-s", shellPath)
}
script.Arguments = append(script.Arguments, info.User)
- script.Arguments = append(script.Arguments, "-c", shellCommand)
\ No newline at end of file
+ script.Arguments = append(script.Arguments, "-c", shellCommand)
+--
+2.18.0
+
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
deleted file mode 100644
index 33cbd23d062c..000000000000
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
-
-let
- version = "1.11.5";
- # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
- docker_x86_64 = fetchurl {
- url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
- sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0";
- };
-
- docker_arm = fetchurl {
- url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
- sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla";
- };
-in
-buildGoPackage rec {
- inherit version;
- name = "gitlab-runner-${version}";
- goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
- commonPackagePath = "${goPackagePath}/common";
- buildFlagsArray = ''
- -ldflags=
- -X ${commonPackagePath}.NAME=gitlab-runner
- -X ${commonPackagePath}.VERSION=${version}
- -X ${commonPackagePath}.REVISION=v${version}
- '';
-
- src = fetchFromGitLab {
- owner = "gitlab-org";
- repo = "gitlab-ci-multi-runner";
- rev = "v${version}";
- sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv";
- };
-
- patches = [ ./fix-shell-path.patch ];
-
- buildInputs = [ go-bindata ];
-
- preBuild = ''
- (
- # go-bindata names the assets after the filename thus we create a symlink with the name we want
- cd go/src/${goPackagePath}
- ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
- ln -sf ${docker_arm} prebuilt-arm.tar.xz
- go-bindata \
- -pkg docker \
- -nocompress \
- -nomemcopy \
- -o executors/docker/bindata.go \
- prebuilt-x86_64.tar.xz \
- prebuilt-arm.tar.xz
- )
- '';
-
- postInstall = ''
- install -d $out/bin
- # The recommended name is gitlab-runner so we create a symlink with that name
- ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
- '';
-
- meta = with lib; {
- description = "GitLab Runner the continuous integration executor of GitLab";
- license = licenses.mit;
- homepage = https://about.gitlab.com/gitlab-ci/;
- platforms = platforms.unix;
- maintainers = [ lib.maintainers.bachp ];
- };
-}
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 2926946cd45a..bc1c2515bfa7 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "pgcli-${version}";
- version = "1.10.3";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "dbcli";
repo = "pgcli";
rev = "v${version}";
- sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
+ sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk";
};
buildInputs = with pythonPackages; [ pytest mock ];
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 8ec6aec9918e..0213eca30d22 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
+, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool
+, withDblatex ? false, dblatex
}:
stdenv.mkDerivation rec {
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
- gnome-doc-utils dblatex gettext which itstool
- ];
+ gnome-doc-utils gettext which itstool
+ ] ++ stdenv.lib.optional withDblatex dblatex;
configureFlags = [ "--disable-scrollkeeper" ];
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 5826dfc2a035..345a25082164 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "icestorm-${version}";
- version = "2018.08.01";
+ version = "2018.09.04";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
- rev = "8cac6c584044034210fe0ba1e6b930ff1cc59465";
- sha256 = "01cnmk4khbbgzc308qj04sfwg0r8b9nh3s7xjsxdjcb3h1m9w88c";
+ rev = "8f61acd0556c8afee83ec2e77dedb03e700333d9";
+ sha256 = "1dwix8bb87xqf27dixdnfp47pll8739h9m9aw8wvvwz4s4989q6v";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
new file mode 100644
index 000000000000..3c6eb6a98b06
--- /dev/null
+++ b/pkgs/development/tools/icr/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, crystal, shards, which
+, openssl, readline }:
+
+stdenv.mkDerivation rec {
+ name = "icr";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "crystal-community";
+ repo = "icr";
+ rev = "v${version}";
+ sha256 = "1vavdzgm06ssnxm6mylki6xma0mfsj63n5kivhk1v4pg4xj966w5";
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace /usr/local $out
+ '';
+
+ buildInputs = [ openssl readline ];
+
+ nativeBuildInputs = [ crystal shards which ];
+
+ doCheck = true;
+
+ checkTarget = "test";
+
+ meta = with stdenv.lib; {
+ description = "Interactive console for the Crystal programming language";
+ homepage = https://github.com/crystal-community/icr;
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 2a707e35b918..3cec26435050 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
stdenv.mkDerivation rec {
- version = "1.4.1";
+ version = "1.4.2";
name = "visualvm-${version}";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
- sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78";
+ sha256 = "0kic1rqxaj2rpnflj1wklsy3gjz50gcb0wak4qi3hjkz5rv6gp1y";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 5cf0badf668e..959bb8698682 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubectx";
- version = "0.5.1";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "ahmetb";
repo = "${name}";
rev = "v${version}";
- sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5";
+ sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg";
};
buildInputs = [ makeWrapper ];
@@ -20,9 +20,24 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
+ mkdir -p $out/share/zsh/site-functions
+ mkdir -p $out/share/bash-completion/completions
+ mkdir -p $out/share/fish/vendor_completions.d
+
cp kubectx $out/bin
cp kubens $out/bin
+ # Provide ZSH completions
+ cp completion/kubectx.zsh $out/share/zsh/site-functions/_kubectx
+ cp completion/kubens.zsh $out/share/zsh/site-functions/_kubens
+
+ # Provide BASH completions
+ cp completion/kubectx.bash $out/share/bash-completion/completions/kubectx
+ cp completion/kubens.bash $out/share/bash-completion/completions/kubens
+
+ # Provide FISH completions
+ cp completion/*.fish $out/share/fish/vendor_completions.d/
+
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]}
done
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index 2d7225ee03ed..2974c653acdd 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "blacksphere";
repo = "blackmagic";
- rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c";
- sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx";
+ rev = "29386aee140e5e99a958727358f60980418b4c88";
+ sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index a1f33fdfc9e7..0e8e0116a8b0 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "fswatch-${version}";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
- sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
+ sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 7235af49c2e6..1ae8a32b6405 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
patches = optional (!vanilla) ./requires-private.patch
++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
- preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ]
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index c6877ed4d1a1..391179e2eb3f 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
- # TODO: fix on mass rebuild
- ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch;
+ patches = optional (version == "6.5") ./perl.patch;
# We need a native compiler to build perl XS extensions
# when cross-compiling.
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 04cbdb6f5748..211934080c8f 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -5,6 +5,8 @@
, libnotify
, ffmpeg, libxcb, cups
, sqlite, udev
+, libuuid
+, sdk ? false
}:
let
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -23,6 +25,7 @@ let
ffmpeg libxcb
# chromium runtime deps (dlopen’d)
sqlite udev
+ libuuid
];
extraOutputsToInstall = [ "lib" "out" ];
@@ -30,13 +33,18 @@ let
in stdenv.mkDerivation rec {
name = "nwjs-${version}";
- version = "0.32.4";
+ version = "0.33.4";
- src = fetchurl {
+ src = if sdk then fetchurl {
+ url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
+ sha256 = if bits == "x64" then
+ "1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else
+ "00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s";
+ } else fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
- "0hzyiy6sbbjll1b946y3v7bv6sav3rhy4c48d4vcvamyv9pkfn45" else
- "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250";
+ "09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else
+ "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
new file mode 100644
index 000000000000..ab810a2ae9fa
--- /dev/null
+++ b/pkgs/development/tools/scry/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, crystal, shards, which }:
+
+stdenv.mkDerivation rec {
+ name = "scry";
+ # 0.7.1 doesn't work with crystal > 0.25
+ version = "0.7.1.20180919";
+
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "scry";
+ rev = "543c1c3f764298f9fff192ca884d10f72338607d";
+ sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn";
+ };
+
+ nativeBuildInputs = [ crystal shards which ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ shards build --release
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin bin/scry
+
+ runHook postInstall
+ '';
+
+ # https://github.com/crystal-lang-tools/scry/issues/138
+ doCheck = false;
+
+ checkPhase = ''
+ runHook preCheck
+
+ crystal spec
+
+ runHook postCheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Code analysis server for the Crystal programming language";
+ homepage = https://github.com/crystal-lang-tools/scry;
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
new file mode 100644
index 000000000000..fa57ce9df21f
--- /dev/null
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "uftrace-${version}";
+ version = "0.9";
+
+ src = fetchFromGitHub {
+ owner = "namhyung";
+ repo = "uftrace";
+ rev = "f0fed0b24a9727ffed04673b62f66baad21a1f99";
+ sha256 = "0rn2xwd87qy5ihn5zq9pwq8cs1vfmcqqz0wl70wskkgp2ccsd9x8";
+ };
+
+ postUnpack = ''
+ patchShebangs .
+ '';
+
+ meta = {
+ description = "Function (graph) tracer for user-space";
+ homepage = https://github.com/namhyung/uftrace;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [stdenv.lib.maintainers.nthorne];
+ };
+}
+
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 6515e220f3d5..fba5fe91ed86 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "valadoc-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/valadoc/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
};
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index e6d23cf1b9f0..c8618c13347d 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bzflag";
- version = "2.4.14";
+ version = "2.4.16";
src = fetchurl {
url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
- sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909";
+ sha256 = "00y2ifjgl4yz1pb2fgkg00vrfb6yk5cfxwjbx3fw2alnsaw6cqgg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 632a047e96c7..fa7fad3ecd92 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "springlobby-${version}";
- version = "0.264";
+ version = "0.267";
src = fetchurl {
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
- sha256 = "1i31anvvywhl2m8014m3vk74cj74l37j6a0idzfhd4ack8b9hg2x";
+ sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index b8e1982a989f..dd6e9a070b19 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,14 +2,14 @@
let
traceLog = "/tmp/steam-trace-dependencies.log";
- version = "1.0.0.51";
+ version = "1.0.0.56";
in stdenv.mkDerivation rec {
name = "steam-original-${version}";
src = fetchurl {
url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
- sha256 = "1ghrfznm9rckm8v87zvh7hx820r5pp7sq575wxwq0fncbyq6sxmz";
+ sha256 = "01jgp909biqf4rr56kb08jkl7g5xql6r2g4ch6lc71njgcsbn5fs";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
@@ -25,6 +25,8 @@ in stdenv.mkDerivation rec {
EOF
chmod +x $out/bin/steamdeps
''}
+ install -d $out/lib/udev/rules.d
+ install -m644 lib/udev/rules.d/*.rules $out/lib/udev/rules.d
'';
meta = with stdenv.lib; {
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/default.nix
rename to pkgs/misc/cups/drivers/samsung/1.00.37.nix
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 35b0ba3684fe..df0a270a5b2b 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -39,5 +39,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.samsung.com/;
license = licenses.unfree;
platforms = platforms.linux;
+ broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time
};
}
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 1a257518e728..c2665353a390 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "3.14";
+ version = "3.17";
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
- sha256 = "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7";
+ sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version;
- sha256 = "0h6gck0p92hin0m13q1hnlfnqs4vy474w66ppinvqms2zn3vibgi";
+ sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 8f2cdb0fcff7..c486d8462ce6 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "materia-theme-${version}";
- version = "20180519";
+ version = "20180928";
src = fetchFromGitHub {
owner = "nana-4";
repo = "materia-theme";
rev = "v${version}";
- sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
+ sha256 = "0v4mvc4rrf3jwf77spn9f5sqxp72v66k2k467r0aw3nglcpm4wpv";
};
nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patchShebangs install.sh
sed -i install.sh \
-e "s|if .*which gnome-shell.*;|if true;|" \
- -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
+ -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
mkdir -p $out/share/themes
./install.sh --dest $out/share/themes
rm $out/share/themes/*/COPYING
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 41f29f34be88..61f7d1debcc0 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,17 +2,21 @@
stdenv.mkDerivation rec {
name = "theme-obsidian2-${version}";
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
- sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv";
+ sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+ postPatch = ''
+ sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
+ '';
+
installPhase = ''
mkdir -p $out/share/themes
cp -a Obsidian-2 $out/share/themes
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
index 609e027d9eba..5e4f8ffa3d46 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -1,23 +1,37 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchurl, unzip }:
-let
- version = "0.98";
-
-in fetchzip {
+stdenv.mkDerivation rec {
name = "onestepback-${version}";
+ version = "0.991";
- url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
+ srcs = [
+ (fetchurl {
+ url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
+ sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm";
+ })
+ (fetchurl {
+ url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip";
+ sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77";
+ })
+ (fetchurl {
+ url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip";
+ sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy";
+ })
+ ];
- postFetch = ''
- mkdir -p $out/share/themes
- unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes
+ nativeBuildInputs = [ unzip ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/share/themes
+ cp -a OneStepBack* $out/share/themes/
+ rm $out/share/themes/*/{LICENSE,README*}
'';
- sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr";
-
meta = with stdenv.lib; {
description = "Gtk theme inspired by the NextStep look";
- homepage = https://www.opendesktop.org/p/1013663/;
+ homepage = http://www.vide.memoire.free.fr/perso/OneStepBack;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix
index 057b96febf3a..529553c9211f 100644
--- a/pkgs/misc/themes/sierra/default.nix
+++ b/pkgs/misc/themes/sierra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sierra-gtk-theme-${version}";
- version = "2018-09-14";
+ version = "2018-10-01";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "sierra-gtk-theme";
- rev = "4c07f9e4978ab2d87ce0f8d4a5d60da21784172c";
- sha256 = "0mp5v462wbjq157hfnqzd8sw374mc611kpk92is2c3qhvj5qb6qd";
+ rev = version;
+ sha256 = "10rjk2lyhlkhhfx6f6r0cykbkxa2jhri4wirc3h2wbzzsx7ch3ix";
};
nativeBuildInputs = [ libxml2 ];
diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix
new file mode 100644
index 000000000000..0d2ddb95166d
--- /dev/null
+++ b/pkgs/misc/themes/tetra/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, gtk3, sassc }:
+
+stdenv.mkDerivation rec {
+ name = "tetra-gtk-theme-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "hrdwrrsk";
+ repo = "tetra-gtk-theme";
+ rev = version;
+ sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd";
+ };
+
+ preBuild = ''
+ # Shut up inkscape's warnings
+ export HOME="$NIX_BUILD_ROOT"
+ '';
+
+ nativeBuildInputs = [ sassc ];
+ buildInputs = [ gtk3 ];
+
+ postPatch = "patchShebangs .";
+
+ installPhase = ''
+ mkdir -p $out/share/themes
+ ./install.sh -d $out/share/themes
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme.";
+ homepage = https://github.com/hrdwrrsk/tetra-gtk-theme;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ dtzWill ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bb6d60e33fb5..8717ec5df487 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2088,6 +2088,16 @@
};
};
+ vim-flake8 = buildVimPluginFrom2Nix {
+ name = "vim-flake8-2018-09-21";
+ src = fetchFromGitHub {
+ owner = "nvie";
+ repo = "vim-flake8";
+ rev = "d50b3715ef386e4d998ff85dad6392110536478d";
+ sha256 = "135374sr4ymyslc9j8qgf4qbhijc3lm8jl9mhhzq1k0ndsz4w3k3";
+ };
+ };
+
vim-ft-diff_fold = buildVimPluginFrom2Nix {
name = "vim-ft-diff_fold-2013-02-10";
src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b6c1d584d6a4..8f0527e1b36d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -194,6 +194,7 @@ neutaaaaan/iosvkem
nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
+nvie/vim-flake8
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
osyo-manga/vim-textobj-multiblock
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
deleted file mode 100644
index a1018d389c14..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CF-855.17/CoreFoundation.h 2015-01-03 00:17:41.000000000 -0500
-+++ CF-855.17/CoreFoundation.h.new 2015-01-03 00:18:35.000000000 -0500
-@@ -72,6 +72,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-
---- CF-855.17/Makefile 2015-01-03 00:32:52.000000000 -0500
-+++ CF-855.17/Makefile.new 2015-01-03 00:33:07.000000000 -0500
-@@ -9,7 +9,7 @@
- HFILES = $(wildcard *.h)
- INTERMEDIATE_HFILES = $(addprefix $(OBJBASE)/CoreFoundation/,$(HFILES))
-
--PUBLIC_HEADERS=CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CFAvailability.h CFUtilities.h CoreFoundation.h
-+PUBLIC_HEADERS=CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMachPort.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CFAvailability.h CFUtilities.h CoreFoundation.h
-
- PRIVATE_HEADERS=CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtilities.h CFPriv.h CFRuntime.h CFStorage.h CFStreamAbstract.h CFStreamPriv.h CFStreamInternal.h CFStringDefaultEncoding.h CFStringEncodingConverter.h CFStringEncodingConverterExt.h CFUniChar.h CFUnicodeDecomposition.h CFUnicodePrecomposition.h ForFoundationOnly.h CFBurstTrie.h CFICULogging.h
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
deleted file mode 100644
index 068a6311a9cb..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CFBase.h b/CFBase.h
-index ffddd2b..e5a926b 100644
---- a/CFBase.h
-+++ b/CFBase.h
-@@ -249,6 +249,33 @@ CF_EXTERN_C_BEGIN
- #endif
- #endif
-
-+#if __has_attribute(objc_bridge) && __has_feature(objc_bridge_id) && __has_feature(objc_bridge_id_on_typedefs)
-+
-+#ifdef __OBJC__
-+@class NSArray;
-+@class NSAttributedString;
-+@class NSString;
-+@class NSNull;
-+@class NSCharacterSet;
-+@class NSData;
-+@class NSDate;
-+@class NSTimeZone;
-+@class NSDictionary;
-+@class NSError;
-+@class NSLocale;
-+@class NSNumber;
-+@class NSSet;
-+@class NSURL;
-+#endif
-+
-+#define CF_BRIDGED_TYPE(T) __attribute__((objc_bridge(T)))
-+#define CF_BRIDGED_MUTABLE_TYPE(T) __attribute__((objc_bridge_mutable(T)))
-+#define CF_RELATED_TYPE(T,C,I) __attribute__((objc_bridge_related(T,C,I)))
-+#else
-+#define CF_BRIDGED_TYPE(T)
-+#define CF_BRIDGED_MUTABLE_TYPE(T)
-+#define CF_RELATED_TYPE(T,C,I)
-+#endif
-
- CF_EXPORT double kCFCoreFoundationVersionNumber;
-
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
deleted file mode 100644
index 5589d1592f46..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }:
-
-# this project uses blocks, a clang-only extension
-assert stdenv.cc.isClang;
-
-appleDerivation {
- buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ];
-
- patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ];
-
- __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ];
-
- preBuild = ''
- substituteInPlace Makefile \
- --replace "/usr/bin/clang" "clang" \
- --replace "-arch i386 " "" \
- --replace "/usr/bin/" "" \
- --replace "/usr/sbin/" "" \
- --replace "/bin/" "" \
- --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
- --replace "install_name_tool -id /System/Library/Frameworks" "install_name_tool -id @rpath" \
- --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
- --replace 'chmod -RH' 'chmod -R'
-
- # with this file present, CoreFoundation gets a _main symbol defined, which can
- # interfere with linking other programs
- rm plconvert.c
-
- replacement=''$'#define __PTK_FRAMEWORK_COREFOUNDATION_KEY5 55\n#define _pthread_getspecific_direct(key) pthread_getspecific((key))\n#define _pthread_setspecific_direct(key, val) pthread_setspecific((key), (val))'
-
- substituteInPlace CFPlatform.c --replace "#include " "$replacement"
-
- substituteInPlace CFRunLoop.c --replace "#include " ""
-
- substituteInPlace CFURLPriv.h \
- --replace "#include " "" \
- --replace "#include " "" \
- --replace "CFFileSecurityRef" "void *" \
- --replace "CFURLEnumeratorResult" "void *" \
- --replace "CFURLEnumeratorRef" "void *"
-
- export DSTROOT=$out
- '';
-
- postInstall = ''
- mv $out/System/* $out
- rmdir $out/System
- mv $out/Library/Frameworks/CoreFoundation.framework/Versions/A/PrivateHeaders/* \
- $out/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers
- '';
-}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
deleted file mode 100644
index a7b9fe486434..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CFBundlePriv.h b/CFBundlePriv.h
-index d4feb5f..e7b52e8 100644
---- a/CFBundlePriv.h
-+++ b/CFBundlePriv.h
-@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle);
- CF_EXPORT
- CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath);
-
--#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
--#include
--CF_EXPORT
--void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0);
--#endif
--
- /* Functions deprecated as SPI */
-
- CF_EXPORT
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 89ff68266a29..761ff3ea9252 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,8 +1,6 @@
-{ cctools, appleDerivation }:
+{ appleDerivation }:
appleDerivation {
- nativeBuildInputs = [ cctools ];
-
patches = [ ./clang-5.patch ];
postPatch = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index e2d62cef1ba4..4fa0c0e3e47f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -204,7 +204,6 @@ let
bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
- CF = applePackage "CF" "osx-10.10.5" "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {};
CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
@@ -216,7 +215,7 @@ let
# Splicing is currently broken in Nixpkgs
# cctools need to be specified manually here to handle this
- ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; };
+ ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
index fe68ee78d1f0..714524e8da58 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -33,7 +33,6 @@ name: version: sha256: args: let
pkgs.gnustep.make
pkgs.darwin.apple_sdk.frameworks.AppKit
pkgs.darwin.apple_sdk.frameworks.Foundation
- pkgs.darwin.cf-private
];
makeFlags = [
"-f${makeFile}"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 609d07fda100..724c4788b6cc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -39,9 +39,5 @@ appleDerivation {
--replace 'return mLoginDLDbIdentifier;' 'return mLoginDLDbIdentifier; }' \
--replace '_xpc_runtime_is_app_sandboxed()' 'false'
# hope that doesn't hurt anything
-
- substituteInPlace lib/KCEventNotifier.h --replace \
- 'CoreFoundation/CFNotificationCenter.h' \
- '${apple_sdk.sdk.out}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h'
'';
}
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index fff6eaaa5c1d..bad17cf6de46 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
-, libcxxabi, libuuid
+, libcxxabi, libuuid, llvm
, libobjc ? null, maloader ? null
, enableDumpNormalizedLibArgs ? false
}:
@@ -56,7 +56,7 @@ let
autoreconfHook
];
buildInputs = [ libuuid ] ++
- stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
+ stdenv.lib.optionals stdenv.isDarwin [ llvm libcxxabi libobjc ];
patches = [
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index 603c0f652b01..3fac20d23c78 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -1,21 +1,59 @@
-{ stdenv, osx_private_sdk, CF }:
+{ CF, apple_sdk }:
-stdenv.mkDerivation {
- name = "${CF.name}-private";
- phases = [ "installPhase" "fixupPhase" ];
- installPhase = ''
- dest=$out/Library/Frameworks/CoreFoundation.framework/Headers
- mkdir -p $dest
- pushd $dest
- for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
- ln -sf $file
- done
-
- # Copy or overwrite private headers, some of these might already
- # exist in CF but the private versions have more information.
- cp -Lfv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
- popd
- '';
+# cf-private is a bit weird, but boils down to CF with a weird setup-hook that
+# makes a build link against the system CoreFoundation rather than our pure one.
+# The reason it exists is that although our CF headers and build are pretty legit
+# now, the underlying runtime is quite different. Apple's in a bit of flux around CF
+# right now, and support three different backends for it: swift, "C", and an ObjC
+# one. The former two can be built from public sources, but the ObjC one isn't really
+# public. Unfortunately, it's also one of the core underpinnings of a lot of Mac-
+# specific behavior, and defines a lot of symbols that some Objective C apps depend
+# on, even though one might expect those symbols to derive from Foundation. So if
+# your app relies on NSArray and several other basic ObjC types, it turns out that
+# because of their magic "toll-free bridging" support, the symbols for those types
+# live in CoreFoundation with an ObjC runtime. And because that isn't public, we have
+# this hack in place to let people link properly anyway. Phew!
+#
+# This can be revisited if Apple ever decide to release the ObjC backend in a publicly
+# buildable form.
+#
+# This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to
+# an existing package was annoying. We need a buildEnv that knows how to add those
+CF.overrideAttrs (orig: {
+ # PLEASE if you add things to this derivation, explain in reasonable detail why
+ # you're adding them and when the workaround can go away. This whole derivation is
+ # a workaround and if you don't explain what you're working around, it makes it
+ # very hard for people to clean it up later.
+ name = "${orig.name}-private";
setupHook = ./setup-hook.sh;
-}
+
+ # TODO: consider re-adding https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
+ # once the missing headers are in and see if that fixes all need for this.
+
+ # This can go away once https://bugs.swift.org/browse/SR-8741 happens, which is
+ # looking more likely these days with the friendly people at Apple! We only need
+ # the header because the setup hook takes care of linking us against a version
+ # of the framework with the functionality built into it. The main user I know of
+ # this is watchman, who can almost certainly switch to the pure CF once the header
+ # and functionality is merged in.
+ installPhase = orig.installPhase + ''
+ basepath="Library/Frameworks/CoreFoundation.framework/Headers"
+ path="$basepath/CFFileDescriptor.h"
+
+ # Append the include at top level or nobody will notice the header we're about to add
+ sed -i '/CFNotificationCenter.h/a #include ' \
+ "$out/$basepath/CoreFoundation.h"
+
+ cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
+ '' +
+ # This one is less likely to go away, but I'll mention it anyway. The issue is at
+ # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase
+ ''
+ path="$basepath/CFURLEnumerator.h"
+ sed -i '/CFNotificationCenter.h/a #include ' \
+ "$out/$basepath/CoreFoundation.h"
+
+ cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
+ '';
+})
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 1dea55cccc9e..f819429f4deb 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -14,11 +14,12 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "apple";
repo = "swift-corelibs-foundation";
- rev = "85c640e7ce50e6ca61a134c72270e214bc63fdba"; # https://github.com/apple/swift-corelibs-foundation/pull/1686
- sha256 = "0z2v278wy7jh0c92g1dszd8hj8naxari660sqx6yab5dwapd46qc";
+ rev = "71aaba20e1450a82c516af1342fe23268e15de0a";
+ sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z";
};
- buildInputs = [ ninja python libxml2 objc4 ICU curl ];
+ nativeBuildInputs = [ ninja python ];
+ buildInputs = [ libxml2 objc4 ICU curl ];
sourceRoot = "source/CoreFoundation";
@@ -31,8 +32,7 @@ in stdenv.mkDerivation {
# 3. Use the legit CoreFoundation.h, not the one telling you not to use it because of Swift
substituteInPlace build.py \
--replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \
- --replace "cf.LDFLAGS += '-ldispatch" '#' \
- --replace "Base.subproj/SwiftRuntime/CoreFoundation.h" 'Base.subproj/CoreFoundation.h'
+ --replace "cf.LDFLAGS += '-ldispatch" '#'
# Includes xpc for some initialization routine that they don't define anyway, so no harm here
substituteInPlace PlugIn.subproj/CFBundlePriv.h \
@@ -53,8 +53,11 @@ in stdenv.mkDerivation {
BUILD_DIR = "./Build";
CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs
- LDFLAGS = "-install_name ${placeholder "out"}/Frameworks/CoreFoundation.framework/CoreFoundation -current_version 1234.56.7 -compatibility_version 150.0.0 -init ___CFInitialize";
- configurePhase = "../configure --sysroot unused";
+
+ # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra"
+ # and this version is a version from there. No idea how accurate it is.
+ LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize";
+ configurePhase = "../configure release --sysroot UNUSED";
enableParallelBuilding = true;
buildPhase = "ninja -j $NIX_BUILD_CORES";
@@ -66,6 +69,12 @@ in stdenv.mkDerivation {
mkdir -p $base/Versions/A/{Headers,PrivateHeaders,Modules}
cp ./Build/CoreFoundation/libCoreFoundation.dylib $base/Versions/A/CoreFoundation
+
+ # Note that this could easily live in the ldflags above as `-install_name @rpath/...` but
+ # https://github.com/NixOS/nixpkgs/issues/46434 thwarts that, so for now I'm hacking it up
+ # after the fact.
+ install_name_tool -id '@rpath/CoreFoundation.framework/Versions/A/CoreFoundation' $base/Versions/A/CoreFoundation
+
cp ./Build/CoreFoundation/usr/include/CoreFoundation/*.h $base/Versions/A/Headers
cp ./Build/CoreFoundation/usr/include/CoreFoundation/module.modulemap $base/Versions/A/Modules
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
deleted file mode 100644
index 0d96b8fd008e..000000000000
--- a/pkgs/os-specific/darwin/swift-corelibs/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, darwin }:
-
-rec {
- corefoundation = callPackage ./corefoundation.nix { inherit (darwin) objc4 ICU; };
- libdispatch = callPackage ./libdispatch.nix {
- inherit (darwin) apple_sdk_sierra xnu;
- };
-}
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 13135844aa7a..8f81ec4918ed 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace " netem " " "
'';
+ outputs = [ "out" "dev"];
+
makeFlags = [
"DESTDIR="
"LIBDIR=$(out)/lib"
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
"MANDIR=$(out)/share/man"
"BASH_COMPDIR=$(out)/share/bash-completion/completions"
"DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
- "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
+ "HDRDIR=$(dev)/include/iproute2"
];
buildFlags = [
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 1e3286f64d68..f30eac588a2f 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
let
ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
- rev = "0.10";
- sha256 = "1yzbx4l3a6hbdmirgbvnrjfiwflyzd38mbxnp23gn9hg3ni3br34";
+ rev = "0.11";
+ sha256 = "0nifa5w6fxy7cagyas2a0zhcppi83yrcsnnp70ls2rc90x4r1ip8";
};
in stdenv.mkDerivation rec {
name = "iwd-${version}";
- version = "0.8";
+ version = "0.9";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
- sha256 = "0bx31f77mz3rbl3xja48lb5zgwgialg7hvax889kpkz92wg26mgv";
+ sha256 = "1l1jbwsshjbz32s4rf0zfcn3fd16si4y9qa0zaxp00bfzflnpcd4";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 09fa4fbfd3a7..23dcbb05f30a 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -3,7 +3,7 @@
}:
let
- common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
+ common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
@@ -20,8 +20,6 @@ let
extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
- # "patches" array defaults to 'null' to avoid changing hash
- # and causing mass rebuild
inherit patches;
buildPhase = ''
@@ -45,7 +43,7 @@ let
in {
linuxHeaders = common {
- version = "4.15";
- sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
+ version = "4.18.3";
+ sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1";
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 6c1740ea2e43..6755e8f90ee1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.73";
+ version = "4.14.74";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "07p3w3p8izgk1d0dblvn9ckk4ay10f40pqbwpzvpsi6c3ha3i7lr";
+ sha256 = "0wjw05brv7l1qpi38drc2z01sa7kpk3kadw36gx9cbvvzn4r3rkh";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 00e8a04f1b9d..aa936929a44c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.18.11";
+ version = "4.18.12";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "131chbsavavz2hnjyx1xjvsnxdcr0y02p054n9mdvxfalvsiklrn";
+ sha256 = "1icz2nkhkb1xhpmc9gxfhc3ywkni8nywk25ixrmgcxp5rgcmlsl4";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 5c4bee036d86..cdd2c67d25b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.130";
+ version = "4.9.131";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0zqaidirnr3v9xibp04rr2cjww3nd3phg28cgid0s8q0idm3xnv0";
+ sha256 = "0q2xmbkh42ikw26bdxgk1f9192hygyq9ffkhjfpr0fcx8sak5nsp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 97921f07e82c..5e6023582082 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -247,7 +247,7 @@ let
maintainers.thoughtpolice
];
platforms = platforms.linux;
- timeout = 7200; # 2 hours
+ timeout = 14400; # 4 hours
} // extraMeta;
};
in
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
index a413008ffd1a..c2fb55b344b4 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, gettext
-, dbus, dbus_glib, libgaminggear, libgudev, lua
+, dbus, dbus-glib, libgaminggear, libgudev, lua
}:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake pkgconfig gettext ];
- buildInputs = [ dbus dbus_glib libgaminggear libgudev lua ];
+ buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ];
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 96c82a6d9f88..db64b8e6f6de 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
- rev = "21efe60844fda21039c052442076dabcf8643a90";
- sha256 = "0aqifjsb0kaxnqy5nlmzvyzgfd99lm60k1494lbnnk8ahdh8ab07";
+ rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
+ sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
};
outputs = [ "out" "lib" "man" "dev" ];
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 11cb914bfd80..932d070577e6 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, unzip, sqlite, makeWrapper, mono54, ffmpeg }:
+{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }:
stdenv.mkDerivation rec {
name = "emby-${version}";
- version = "3.5.2.0";
+ version = "3.5.3.0";
# We are fetching a binary here, however, a source build is possible.
# See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# This may also need msbuild (instead of xbuild) which isn't in nixpkgs
# See -> https://github.com/NixOS/nixpkgs/issues/29817
src = fetchurl {
- url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-mono_${version}.zip";
- sha256 = "12f9skvnr9qxnrvr3q014yggfwvkpjk0ynbgf0fwk56h4kal7fx8";
+ url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip";
+ sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj";
};
buildInputs = [
@@ -21,26 +21,25 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
- mono54
+ dotnet-sdk
sqlite
];
preferLocalBuild = true;
- # Need to set sourceRoot as unpacker will complain about multiple directory output
- sourceRoot = ".";
-
buildPhase = ''
- substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
- substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
+ rm -rf {electron,runtimes}
'';
installPhase = ''
- mkdir -p "$out/bin"
- cp -r * "$out/bin"
+ install -dm 755 "$out/opt/emby-server"
+ cp -r * "$out/opt/emby-server"
- makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
- --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
+ makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+ sqlite
+ ]}" \
+ --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index fe416876546c..4c384c7b2b89 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jackett-${version}";
- version = "0.10.198";
+ version = "0.10.258";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "1svlb38iy47bv88rbk1nimb7pixxh142xr4xf761l3nm69w9qyfq";
+ sha256 = "1wlg1spz2cxddaagjs6hv5fks3n1wwfm9jmih3rh1vq1rx8j1xnq";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 3290d8ba1d1a..9bffb27665dd 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lidarr-${version}";
- version = "0.3.1.471";
+ version = "0.4.0.524";
src = fetchurl {
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
- sha256 = "1x8q5yivkz8rwpkz0gdi73iaszb253bm1c3rdzar7xgrqr3g11nm";
+ sha256 = "121898v8n9sr9wwys65c28flpmk941wk6df11bb47pfjcalrr3bj";
};
buildInputs = [
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index ce9e2f8c40b2..b8649715eb37 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "check_ssl_cert-${version}";
- version = "1.72.0";
+ version = "1.73.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
- sha256 = "1125yffw0asxa3blcgg6gr8nvwc5jhxbqi0wak5w06svw8ka9wpr";
+ sha256 = "0ymaypsv1s5pmk8fg9d67khcjy5h7vjbg6hd1fgslp92qcw90dqa";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 8a0a848aa5d6..3b5e46cdb2a8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
- name= "nextcloud-${version}";
- version = "13.0.6";
+ name = "nextcloud-${version}";
+ version = "14.0.1";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
- sha256 = "1m38k5jafz2lniy6fmq17xffkgaqs6rl4w789sqpniva1fb9xz4h";
+ sha256 = "14ymc6fr91735yyc2gqh7c89mbbwsgamhhysf6crp9kp27l83z5a";
};
+ patches = [ (fetchpatch {
+ name = "Mailer-discover-sendmail-path-instead-of-hardcoding-.patch";
+ url = https://github.com/nextcloud/server/pull/11404.patch;
+ sha256 = "1h0cqnfwn735vqrm3yh9nh6a7h6srr9h29p13vywd6rqbcndqjjd";
+ }) ];
+
installPhase = ''
mkdir -p $out/
cp -R . $out/
@@ -17,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sharing solution for files, calendars, contacts and more";
homepage = https://nextcloud.com;
- maintainers = with stdenv.lib.maintainers; [ schneefux bachp ];
+ maintainers = with stdenv.lib.maintainers; [ schneefux bachp globin fpletz ];
license = stdenv.lib.licenses.agpl3Plus;
platforms = with stdenv.lib.platforms; unix;
};
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 72485d388a15..1f4876c11183 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
let
in stdenv.mkDerivation rec {
- version = "3.3.15";
+ version = "3.3.16";
name = "arangodb-${version}";
src = fetchFromGitHub {
repo = "arangodb";
owner = "arangodb";
rev = "v${version}";
- sha256 = "177n2l8k8fswxvz102n6lm0qsn0fvq0s2zx6skrfg4g7gil3wkyb";
+ sha256 = "0pw930ri5a0f1s6mhsbjc58lsmpy535f5wv2vcp8mzdx1rk3l091";
};
buildInputs = [
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index cc16838d082f..1fba6571e281 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "neo4j-${version}";
- version = "3.4.6";
+ version = "3.4.7";
src = fetchurl {
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
- sha256 = "0bby42sp7gpyglp03c5nq9hzzlcckzfsc84i07jlx8gglidw80l3";
+ sha256 = "0jgk7kvsalpmawdds0ln76ma7qbdxwgh004lkalicciiljkyv8pj";
};
buildInputs = [ makeWrapper jre8 which gawk ];
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 523292f6b0f4..cf0fddd6699b 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -10,11 +10,6 @@ buildPerlPackage rec {
sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
};
- patches = [ (fetchpatch {
- url = "https://github.com/Logitech/slimserver/pull/204.patch";
- sha256 = "0n1c8nsbvqkmwj5ivkcxh1wkqqm1lwymmfz9i47ih6ifj06hkpxk";
- } ) ];
-
buildInputs = [
makeWrapper
perl
@@ -72,6 +67,10 @@ buildPerlPackage rec {
rm -rf CPAN
rm -rf Bin
touch Makefile.PL
+
+ # relax audio scan version constraints
+ substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01"
+ substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93"
'';
preConfigurePhase = "";
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index be279937ef8a..b1097c1e96fc 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "traefik-${version}";
- version = "1.7.0";
+ version = "1.7.1";
goPackagePath = "github.com/containous/traefik";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "containous";
repo = "traefik";
rev = "v${version}";
- sha256 = "1nv2w174vw5dq60cz8a2riwjyl9rzxqwp7z7v5zv7ch0bxq9cvhn";
+ sha256 = "13vvwb1mrnxn4y1ga37pc5c46qdj5jkrcnyn2w9rb59madgq4c77";
};
buildInputs = [ go-bindata bash ];
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 7436c06d7b84..ae7dd9805776 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,13 +49,13 @@ in rec {
};
unifiStable = generic {
- version = "5.8.28";
- sha256 = "1zyc6n54dwqy9diyqnzlwypgnj3hqcv0lfx47s4rkq3kbm49nwnl";
+ version = "5.8.30";
+ sha256 = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi";
};
unifiTesting = generic {
- version = "5.9.22";
- suffix = "-d2a4718971";
- sha256 = "1xxpvvn0815snag4bmmsdm8zh0cb2qjrhnvlkgn8i478ja1r3n54";
+ version = "5.9.29";
+ suffix = "-04b5d20997";
+ sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
};
}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5bd35b509ad8..06dd540a4818 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1136,11 +1136,11 @@ let
}) // {inherit ;};
libxcb = (mkDerivation "libxcb" {
- name = "libxcb-1.12";
+ name = "libxcb-1.13";
builder = ./builder.sh;
src = fetchurl {
- url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2;
- sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa";
+ url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2;
+ sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
@@ -1448,11 +1448,11 @@ let
}) // {inherit ;};
xcbproto = (mkDerivation "xcbproto" {
- name = "xcb-proto-1.12";
+ name = "xcb-proto-1.13";
builder = ./builder.sh;
src = fetchurl {
- url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2;
- sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr";
+ url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2;
+ sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python ];
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 28b698bdc816..222a9f654266 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index dc7133e988fa..0b7b934646e2 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -6,6 +6,10 @@ buildGoPackage rec {
goPackagePath = "github.com/elves/elvish";
excludedPackages = [ "website" ];
+ buildFlagsArray = ''
+ -ldflags=
+ -X ${goPackagePath}/buildinfo.Version=${version}
+ '';
src = fetchFromGitHub {
repo = "elvish";
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6d224e4cc44f..5fb410b64ebd 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -88,7 +88,6 @@ in rec {
extraPackages = lib.optional (libcxx != null) libcxx;
nativeTools = false;
- propagateDoc = false;
nativeLibc = false;
inherit buildPackages coreutils gnugrep bintools;
libc = last.pkgs.darwin.Libsystem;
@@ -198,6 +197,10 @@ in rec {
CF = null; # use CoreFoundation from bootstrap-tools
configd = null;
};
+ python2 = self.python;
+
+ ninja = super.ninja.override { buildDocs = false; };
+ darwin = super.darwin // { cctools = super.darwin.cctools.override { llvm = null; }; };
};
in with prevStage; stageFun 1 prevStage {
extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -217,11 +220,12 @@ in rec {
zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
- findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
+ findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
+ libssh2 nghttp2 libkrb5 python2 ninja;
darwin = super.darwin // {
inherit (darwin)
- dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
+ dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
};
};
in with prevStage; stageFun 2 prevStage {
@@ -235,7 +239,10 @@ in rec {
allowedRequisites =
[ bootstrapTools ] ++
- (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
+ (with pkgs; [
+ xz.bin xz.out libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
+ nghttp2.lib libkrb5
+ ]) ++
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
overrides = persistent;
@@ -247,9 +254,10 @@ in rec {
patchutils m4 scons flex perl bison unifdef unzip openssl python
gettext sharutils libarchive pkg-config groff bash subversion
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
- findfreetype libssh curl cmake autoconf automake libtool cpio;
+ findfreetype libssh curl cmake autoconf automake libtool cpio
+ libssh2 nghttp2 libkrb5 python2 ninja;
- # Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds.
+ # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
libxml2 = super.libxml2.override { pythonSupport = false; };
llvmPackages_5 = super.llvmPackages_5 // (let
@@ -281,7 +289,10 @@ in rec {
allowedRequisites =
[ bootstrapTools ] ++
- (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
+ (with pkgs; [
+ xz.bin xz.out bash libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
+ nghttp2.lib libkrb5
+ ]) ++
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
overrides = persistent;
@@ -292,7 +303,7 @@ in rec {
inherit
gnumake gzip gnused bzip2 gawk ed xz patch bash
ncurses libffi zlib gmp pcre gnugrep
- coreutils findutils diffutils patchutils;
+ coreutils findutils diffutils patchutils ninja;
# Hack to make sure we don't link ncurses in bootstrap tools. The proper
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
@@ -312,8 +323,14 @@ in rec {
});
in { inherit tools libraries; } // tools // libraries);
- darwin = super.darwin // {
+ darwin = super.darwin // rec {
inherit (darwin) dyld Libsystem libiconv locale;
+
+ libxml2-nopython = super.libxml2.override { pythonSupport = false; };
+ CF = super.darwin.CF.override {
+ libxml2 = libxml2-nopython;
+ python = prevStage.python;
+ };
};
};
in with prevStage; stageFun 4 prevStage {
@@ -345,6 +362,17 @@ in rec {
});
in { inherit tools libraries; } // tools // libraries);
+ # N.B: the important thing here is to ensure that python == python2
+ # == python27 or you get weird issues with inconsistent package sets.
+ # In a particularly subtle bug, I overrode python2 instead of python27
+ # here, and it caused gnome-doc-utils to complain about:
+ # "PyThreadState_Get: no current thread". This is because Python gets
+ # really unhappy if you have Python A which loads a native python lib
+ # which was linked against Python B, which in our case was happening
+ # because we didn't override python "deeply enough". Anyway, this works
+ # and I'm just leaving this blurb here so people realize why it matters
+ python27 = super.python27.override { CF = prevStage.darwin.CF; };
+
darwin = super.darwin // {
inherit (darwin) dyld ICU Libsystem libiconv;
} // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
@@ -398,9 +426,10 @@ in rec {
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
binutils.bintools darwin.binutils darwin.binutils.bintools
+ curl.out openssl.out libssh2.out nghttp2.lib libkrb5
cc.expand-response-params
]) ++ (with pkgs.darwin; [
- dyld Libsystem CF cctools ICU libiconv locale
+ dyld Libsystem CF cctools ICU libiconv locale libxml2-nopython.out
]);
overrides = lib.composeExtensions persistent (self: super: {
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 66c5f419f2f6..eee3b1ce0759 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -3,7 +3,7 @@
with import pkgspath { inherit system; };
let
- llvmPackages = llvmPackages_4;
+ llvmPackages = llvmPackages_5;
in rec {
coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support.
@@ -12,6 +12,10 @@ in rec {
singleBinary = false;
});
+ # We want a version of cctools without LLVM, because the LTO support ends up making
+ # the bootstrap tools huge and isn't really necessary for bootstrap
+ cctools_ = darwin.cctools.override { llvm = null; };
+
# Avoid debugging larger changes for now.
bzip2_ = bzip2.override (args: { linkStatic = true; });
@@ -73,6 +77,7 @@ in rec {
cp -d ${gettext}/lib/libintl*.dylib $out/lib
chmod +x $out/lib/libintl*.dylib
cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
+ cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib
# Copy what we need of clang
cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
@@ -94,7 +99,7 @@ in rec {
# Copy binutils.
for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do
- cp ${darwin.cctools}/bin/$i $out/bin
+ cp ${cctools_}/bin/$i $out/bin
done
cp -rd ${pkgs.darwin.CF}/Library $out
@@ -104,9 +109,9 @@ in rec {
nuke-refs $out/bin/*
rpathify() {
- local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
+ local libs=$(${cctools_}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
for lib in $libs; do
- ${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
+ ${cctools_}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
done
}
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index c663c3743ed6..2db40fc43e36 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -225,6 +225,8 @@ rec {
inherit doCheck doInstallCheck;
inherit outputs;
+ } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
+ enableParallelChecking = attrs.enableParallelChecking or true;
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
NIX_HARDENING_ENABLE = enabledHardeningOptions;
} // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 141e94c5ed46..8af369b1d17d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -211,7 +211,7 @@ isELF() {
exec {fd}< "$fn"
read -r -n 4 -u "$fd" magic
exec {fd}<&-
- if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
+ if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi
}
# Return success if the specified file is a script (i.e. starts with
@@ -257,9 +257,17 @@ shopt -s nullglob
# Set up the initial path.
PATH=
+HOST_PATH=
for i in $initialPath; do
if [ "$i" = / ]; then i=; fi
addToSearchPath PATH "$i/bin"
+
+ # For backward compatibility, we add initial path to HOST_PATH so
+ # it can be used in auto patch-shebangs. Unfortunately this will
+ # not work with cross compilation.
+ if [ -z "${strictDeps-}" ]; then
+ addToSearchPath HOST_PATH "$i/bin"
+ fi
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
@@ -272,7 +280,6 @@ if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
BASH="$SHELL"
export CONFIG_SHELL="$SHELL"
-
# Dummy implementation of the paxmark function. On Linux, this is
# overwritten by paxctl's setup hook.
paxmark() { true; }
@@ -1044,7 +1051,7 @@ checkPhase() {
# Old bash empty array hack
# shellcheck disable=SC2086
local flagsArray=(
- ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+ ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
${checkTarget}
@@ -1176,7 +1183,7 @@ installCheckPhase() {
# Old bash empty array hack
# shellcheck disable=SC2086
local flagsArray=(
- ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+ ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
${installCheckTarget:-installcheck}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 08703b6934e5..978beea692c6 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -92,7 +92,6 @@ let
else lib.makeOverridable (import ../../build-support/cc-wrapper) {
name = "${name}-gcc-wrapper";
nativeTools = false;
- propagateDoc = false;
nativeLibc = false;
buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
inherit (prevStage) stdenv;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4fc9999b538c..59ded9d81108 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,8 +112,8 @@ in with pkgs; rec {
cp -d ${gcc.cc.out}/bin/gcc $out/bin
cp -d ${gcc.cc.out}/bin/cpp $out/bin
cp -d ${gcc.cc.out}/bin/g++ $out/bin
- cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib
- cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib
+ cp -d ${gcc.cc.lib}/lib/libgcc_s.so* $out/lib
+ cp -d ${gcc.cc.lib}/lib/libstdc++.so* $out/lib
cp -rd ${gcc.cc.out}/lib/gcc $out/lib
chmod -R u+w $out/lib
rm -f $out/lib/gcc/*/*/include*/linux
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 24255f3f6555..24948ce9aa4e 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -29,4 +29,6 @@ with pkgs;
macOSSierraShared = callPackage ./macos-sierra-shared {};
cross = callPackage ./cross {};
+
+ patch-shebangs = callPackage ./patch-shebangs {};
}
diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix
new file mode 100644
index 000000000000..a82e5e1e1982
--- /dev/null
+++ b/pkgs/test/patch-shebangs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, runCommand }:
+
+let
+ bad-shebang = stdenv.mkDerivation {
+ name = "bad-shebang";
+ unpackPhase = ":";
+ installPhase = ''
+ mkdir -p $out/bin
+ echo "#!/bin/sh" > $out/bin/test
+ echo "echo -n hello" >> $out/bin/test
+ chmod +x $out/bin/test
+ '';
+ };
+in runCommand "patch-shebangs-test" {
+ passthru = { inherit bad-shebang; };
+ meta.platforms = stdenv.lib.platforms.all;
+} ''
+ printf "checking whether patchShebangs works properly... ">&2
+ if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then
+ echo "yes" >&2
+ touch $out
+ else
+ echo "no" >&2
+ exit 1
+ fi
+''
\ No newline at end of file
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 23270793b34e..915144daa908 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python2Packages, pkgconfig
+{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
, makeWrapper, xorgserver, getopt, xauth, utillinux, which
, ffmpeg, x264, libvpx, libwebp
@@ -10,12 +10,14 @@ with lib;
let
inherit (python2Packages) cython buildPythonApplication;
+
+ xf86videodummy = callPackage ./xf86videodummy { };
in buildPythonApplication rec {
- name = "xpra-${version}";
+ pname = "xpra";
version = "2.3.3";
src = fetchurl {
- url = "https://xpra.org/src/${name}.tar.xz";
+ url = "https://xpra.org/src/${pname}-${version}.tar.xz";
sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01";
};
@@ -73,6 +75,7 @@ in buildPythonApplication rec {
# sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
#'';
+ passthru = { inherit xf86videodummy; };
meta = {
homepage = http://xpra.org/;
@@ -80,7 +83,7 @@ in buildPythonApplication rec {
downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
description = "Persistent remote applications for X";
platforms = platforms.linux;
- maintainers = with maintainers; [ tstrobel offline ];
license = licenses.gpl2;
+ maintainers = with maintainers; [ tstrobel offline numinit ];
};
}
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
new file mode 100644
index 000000000000..f91e53d1e493
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
@@ -0,0 +1,96 @@
+--- a/src/dummy.h 2016-12-17 23:02:53.396287041 +0100
++++ b/src/dummy.h 2016-12-17 23:03:30.319616550 +0100
+@@ -51,6 +51,7 @@
+ /* options */
+ OptionInfoPtr Options;
+ Bool swCursor;
++ Bool constantDPI;
+ /* proc pointer */
+ CloseScreenProcPtr CloseScreen;
+ xf86CursorInfoPtr CursorInfo;
+--- a/src/dummy_driver.c 2016-12-14 21:54:20.000000000 +0100
++++ b/src/dummy_driver.c 2016-12-17 23:04:59.916416126 +0100
+@@ -17,6 +17,12 @@
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+
++#ifdef RANDR
++#include "randrstr.h"
++#endif
++
++#include "windowstr.h"
++
+ /* identifying atom needed by magnifiers */
+ #include
+ #include "property.h"
+@@ -115,11 +121,15 @@
+ };
+
+ typedef enum {
+- OPTION_SW_CURSOR
++ OPTION_SW_CURSOR,
++ OPTION_CONSTANT_DPI
+ } DUMMYOpts;
+
+ static const OptionInfoRec DUMMYOptions[] = {
+ { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
++#ifdef RANDR
++ { OPTION_CONSTANT_DPI, "ConstantDPI", OPTV_BOOLEAN, {0}, FALSE },
++#endif
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
+ };
+
+@@ -359,6 +369,7 @@
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, dPtr->Options);
+
+ xf86GetOptValBool(dPtr->Options, OPTION_SW_CURSOR,&dPtr->swCursor);
++ xf86GetOptValBool(dPtr->Options, OPTION_CONSTANT_DPI, &dPtr->constantDPI);
+
+ if (device->videoRam != 0) {
+ pScrn->videoRam = device->videoRam;
+@@ -639,10 +650,45 @@
+ return TRUE;
+ }
+
++const char *XDPY_PROPERTY = "dummy-constant-xdpi";
++const char *YDPY_PROPERTY = "dummy-constant-ydpi";
++static int get_dpi_value(WindowPtr root, const char *property_name, int default_dpi)
++{
++ PropertyPtr prop;
++ Atom type_atom = MakeAtom("CARDINAL", 8, TRUE);
++ Atom prop_atom = MakeAtom(property_name, strlen(property_name), FALSE);
++
++ for (prop = wUserProps(root); prop; prop = prop->next) {
++ if (prop->propertyName == prop_atom && prop->type == type_atom && prop->data) {
++ int v = (int) (*((CARD32 *) prop->data));
++ if ((v>0) && (v<4096)) {
++ xf86DrvMsg(0, X_INFO, "get_constant_dpi_value() found property \"%s\" with value=%i\n", property_name, (int) v);
++ return (int) v;
++ }
++ break;
++ }
++ }
++ return default_dpi;
++}
++
+ /* Mandatory */
+ Bool
+ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
++ SCRN_INFO_PTR(arg);
++#ifdef RANDR
++ DUMMYPtr dPtr = DUMMYPTR(pScrn);
++ if (dPtr->constantDPI) {
++ int xDpi = get_dpi_value(pScrn->pScreen->root, XDPY_PROPERTY, pScrn->xDpi);
++ int yDpi = get_dpi_value(pScrn->pScreen->root, YDPY_PROPERTY, pScrn->yDpi);
++ //25.4 mm per inch: (254/10)
++ pScrn->pScreen->mmWidth = mode->HDisplay * 254 / xDpi / 10;
++ pScrn->pScreen->mmHeight = mode->VDisplay * 254 / yDpi / 10;
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mm(dpi %ix%i)=%ix%i\n", xDpi, yDpi, pScrn->pScreen->mmWidth, pScrn->pScreen->mmHeight);
++ RRScreenSizeNotify(pScrn->pScreen);
++ RRTellChanged(pScrn->pScreen);
++ }
++#endif
+ return TRUE;
+ }
+
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
new file mode 100644
index 000000000000..3dbb6fd179ff
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
@@ -0,0 +1,39 @@
+--- xf86-video-dummy-0.3.6/src/dummy_driver.c 2014-11-05 19:24:02.668656601 +0700
++++ xf86-video-dummy-0.3.6.new/src/dummy_driver.c 2014-11-05 19:37:53.076061853 +0700
+@@ -55,6 +55,9 @@
+ #include
+ #endif
+
++/* Needed for fixing pointer limits on resize */
++#include "inputstr.h"
++
+ /* Mandatory functions */
+ static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid);
+ static void DUMMYIdentify(int flags);
+@@ -713,6 +716,26 @@
+ RRTellChanged(pScrn->pScreen);
+ }
+ #endif
++ //ensure the screen dimensions are also updated:
++ pScrn->pScreen->width = mode->HDisplay;
++ pScrn->pScreen->height = mode->VDisplay;
++ pScrn->virtualX = mode->HDisplay;
++ pScrn->virtualY = mode->VDisplay;
++ pScrn->frameX1 = mode->HDisplay;
++ pScrn->frameY1 = mode->VDisplay;
++
++ //ensure the pointer uses the new limits too:
++ DeviceIntPtr pDev;
++ SpritePtr pSprite;
++ for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
++ if (pDev->spriteInfo!=NULL && pDev->spriteInfo->sprite!=NULL) {
++ pSprite = pDev->spriteInfo->sprite;
++ pSprite->hotLimits.x2 = mode->HDisplay;
++ pSprite->hotLimits.y2 = mode->VDisplay;
++ pSprite->physLimits.x2 = mode->HDisplay;
++ pSprite->physLimits.y2 = mode->VDisplay;
++ }
++ }
+ return TRUE;
+ }
+
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
new file mode 100644
index 000000000000..567db3fc3865
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
@@ -0,0 +1,41 @@
+--- a/src/dummy.h 2016-12-17 23:33:33.279533389 +0100
++++ b/src/dummy.h 2016-12-17 23:33:56.695739166 +0100
+@@ -69,7 +69,7 @@
+ int overlay_offset;
+ int videoKey;
+ int interlace;
+- dummy_colors colors[256];
++ dummy_colors colors[1024];
+ pointer* FBBase;
+ Bool (*CreateWindow)() ; /* wrapped CreateWindow */
+ Bool prop;
+--- a/src/dummy_driver.c 2016-12-17 23:33:47.446657886 +0100
++++ b/src/dummy_driver.c 2016-12-17 23:33:56.696739175 +0100
+@@ -317,6 +317,7 @@
+ case 15:
+ case 16:
+ case 24:
++ case 30:
+ break;
+ default:
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -331,8 +332,8 @@
+ pScrn->rgbBits = 8;
+
+ /* Get the depth24 pixmap format */
+- if (pScrn->depth == 24 && pix24bpp == 0)
+- pix24bpp = xf86GetBppFromDepth(pScrn, 24);
++ if (pScrn->depth >= 24 && pix24bpp == 0)
++ pix24bpp = xf86GetBppFromDepth(pScrn, pScrn->depth);
+
+ /*
+ * This must happen after pScrn->display has been set because
+@@ -623,7 +624,7 @@
+ if(!miCreateDefColormap(pScreen))
+ return FALSE;
+
+- if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++ if (!xf86HandleColormaps(pScreen, 1024, pScrn->rgbBits,
+ DUMMYLoadPalette, NULL,
+ CMAP_PALETTED_TRUECOLOR
+ | CMAP_RELOAD_ON_MODE_SWITCH))
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix
new file mode 100644
index 000000000000..ab786d9bce84
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl
+, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto
+, pkgconfig
+, xpra }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+ version = "0.3.8";
+ suffix = "1";
+ name = "xpra-xf86videodummy-${version}-${suffix}";
+ builder = ../../../../servers/x11/xorg/builder.sh;
+ src = fetchurl {
+ url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2";
+ sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
+ };
+ patches = [
+ ./0002-Constant-DPI.patch
+ ./0003-fix-pointer-limits.patch
+ ./0005-support-for-30-bit-depth-in-dummy-driver.patch
+ ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+
+ meta = {
+ description = "Dummy driver for Xorg with xpra patches";
+ homepage = https://xpra.org/trac/wiki/Xdummy;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ numinit ];
+ };
+}
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index a037a2e42aaa..c0c1e416b80f 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bubblewrap-${version}";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchurl {
url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
- sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8";
+ sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny";
};
nativeBuildInputs = [ libcap libxslt docbook_xsl ];
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 8fe6feaee0a6..57896fd7f637 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "pasystray-${version}";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "christophgysin";
repo = "pasystray";
rev = name;
- sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h";
+ sha256 = "0cc9hjyw4gr4ip4lw74pzb1l9sxs3ffhf0xn0m1fhmyfbjyixwkh";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 0bde9b0b26e1..138f727c3d30 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "disorderfs-${version}";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchurl {
url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
- sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq";
+ sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y";
};
nativeBuildInputs = [ pkgconfig asciidoc ];
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index e2b87007b09f..168bf7d076ce 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo, perl }:
+{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.44.4";
@@ -15,8 +15,14 @@ stdenv.mkDerivation rec {
buildInputs = [ libuuid gettext ];
# Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
- NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")
- "-D__GNUC_PREREQ(maj,min)=0";
+ patches = if stdenv.hostPlatform.libc == "glibc" then null
+ else [
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/void-linux/void-packages/1f3b51493031cc0309009804475e3db572fc89ad/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
+ sha256 = "1q7y8nhsfwl9r1q7nhrlikazxxj97p93kgz5wh7723cshlji2vaa";
+ extraPrefix = "";
+ })
+ ];
configureFlags =
if stdenv.isLinux then [
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
new file mode 100644
index 000000000000..48f13925ab08
--- /dev/null
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, git }:
+
+# Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by
+# overriding the same-named attributes. See ./presets.nix for examples.
+
+stdenv.mkDerivation rec {
+ name = "mkspiffs-${version}";
+ version = "0.2.3";
+
+ src = fetchFromGitHub {
+ owner = "igrr";
+ repo = "mkspiffs";
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "1fgw1jqdlp83gv56mgnxpakky0q6i6f922niis4awvxjind8pbm1";
+ };
+
+ nativeBuildInputs = [ git ];
+ buildFlags = [ "dist" ];
+ installPhase = ''
+ mkdir -p $out/bin
+ cp mkspiffs $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tool to build and unpack SPIFFS images";
+ license = licenses.mit;
+ homepage = https://github.com/igrr/mkspiffs;
+ maintainers = with maintainers; [ haslersn ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix
new file mode 100644
index 000000000000..c0b74d9cf1b7
--- /dev/null
+++ b/pkgs/tools/filesystems/mkspiffs/presets.nix
@@ -0,0 +1,20 @@
+{ lib, mkspiffs }:
+
+# We provide the same presets as the upstream
+
+lib.mapAttrs (
+ name: { CPPFLAGS }:
+ mkspiffs.overrideAttrs (drv: {
+ inherit CPPFLAGS;
+ BUILD_CONFIG_NAME = "-${name}";
+ })
+) {
+ arduino-esp8266.CPPFLAGS = [
+ "-DSPIFFS_USE_MAGIC_LENGTH=0"
+ "-DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1"
+ ];
+
+ arduino-esp32.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ];
+
+ esp-idf.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ];
+}
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix
index 3708bc9c0fc6..fef5c657a7a2 100644
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -10,13 +10,13 @@ in
buildPerlPackage rec {
name = "feedgnuplot-${version}";
- version = "1.49";
+ version = "1.51";
src = fetchFromGitHub {
owner = "dkogan";
repo = "feedgnuplot";
rev = "v${version}";
- sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02";
+ sha256 = "0npk2l032cnmibjj5zf3ii09mpxciqn32lx6g5bal91bkxwn7r5i";
};
outputs = [ "out" ];
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 20beacf2b4f0..9a62f8c3fbf7 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,7 +6,7 @@
let
python = python3Packages.python;
- version = "1.6";
+ version = "1.7";
in
stdenv.mkDerivation {
name = "autorandr-${version}";
@@ -48,7 +48,7 @@ in
owner = "phillipberndt";
repo = "autorandr";
rev = "${version}";
- sha256 = "0m4lqqinr1mqf536gll7qyrnz86ca322pf99lagj00x0r8yj9liy";
+ sha256 = "0wpiimc5xai813h7gywwp20svkn35pkw99bnjflmpwz7x8fn8dfz";
};
meta = {
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 3d1c7145698c..582f8d8f05f9 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
with lib;
stdenv.mkDerivation rec {
- name = "coreutils-8.29";
+ name = "coreutils-8.30";
src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz";
- sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
+ sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
};
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
+ sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl
substituteInPlace ./tests/install/install-C.sh \
--replace 'mode3=2755' 'mode3=1755'
'';
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index d6eca100411b..d19117d4dcda 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
};
- patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
+ patches = [
+ ./memory-leak.patch
+ ./no-install-statedir.patch
+
+ # Prevent tests from failing on old kernels (2.6x)
+ # getdtablesize reports incorrect values if getrlimit() fails
+ ./disable-getdtablesize-test.patch
+ ];
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
new file mode 100644
index 000000000000..611df364b687
--- /dev/null
+++ b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/test-dup2.c b/tests/test-dup2.c
+--- a/tests/test-dup2.c
++++ b/tests/test-dup2.c
+@@ -157,8 +157,6 @@ main (void)
+ ASSERT (close (255) == 0);
+ ASSERT (close (256) == 0);
+ }
+- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
+- ASSERT (close (bad_fd - 1) == 0);
+ errno = 0;
+ ASSERT (dup2 (fd, bad_fd) == -1);
+ ASSERT (errno == EBADF);
+diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
+index a0325af..a83f8ec 100644
+--- a/tests/test-getdtablesize.c
++++ b/tests/test-getdtablesize.c
+@@ -29,8 +29,6 @@ int
+ main (int argc, char *argv[])
+ {
+ ASSERT (getdtablesize () >= 3);
+- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
+- ASSERT (dup2 (0, getdtablesize()) == -1);
+
+ return 0;
+ }
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index d9c255d2a7a8..339c8dea4606 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform
+, Security
+}:
rustPlatform.buildRustPackage rec {
name = "hyperfine-${version}";
- version = "1.1.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "hyperfine";
rev = "refs/tags/v${version}";
- sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg";
+ sha256 = "06kghk3gmi47c8g28n8srpb578yym104fa30s4m33ajb60fvwlld";
};
- cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
+ cargoSha256 = "1rwh8kyrkk5jza4lx7sf1pln68ljwsv4ccyfvzcvc140y7ya8ps0";
+
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = "Command-line benchmarking tool";
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7af5e12081b6..11a9cd4ff87a 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm";
};
- nativeBuildInputs = [ makeWrapper perl ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl procps ];
postInstall = ''
wrapProgram $out/bin/parallel \
- --prefix PATH : "${procps}/bin" \
- --prefix PATH : "${perl}/bin" \
+ --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}"
'';
doCheck = true;
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 08df665aede6..b3ceb41191de 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,37 +1,34 @@
-{ stdenv, fetchurl, jre, graphviz }:
+{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2018.10";
+ version = "1.2018.11";
name = "plantuml-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs";
+ sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm";
};
- # It's only a .jar file and a shell wrapper
- phases = [ "installPhase" ];
+ nativeBuildInputs = [ makeWrapper ];
- installPhase = ''
- mkdir -p "$out/bin"
- mkdir -p "$out/lib"
+ buildCommand = ''
+ install -Dm644 $src $out/lib/plantuml.jar
- cp "$src" "$out/lib/plantuml.jar"
+ mkdir -p $out/bin
+ makeWrapper ${jre}/bin/java $out/bin/plantuml \
+ --argv0 plantuml \
+ --set GRAPHVIZ_DOT ${graphviz}/bin/dot \
+ --add-flags "-jar $out/lib/plantuml.jar"
- cat > "$out/bin/plantuml" << EOF
- #!${stdenv.shell}
- export GRAPHVIZ_DOT="${graphviz}/bin/dot"
- exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@"
- EOF
- chmod a+x "$out/bin/plantuml"
+ $out/bin/plantuml -help
'';
meta = with stdenv.lib; {
description = "Draw UML diagrams using a simple and human readable text description";
homepage = http://plantuml.sourceforge.net/;
- # "java -jar plantuml.jar -license" says GPLv3 or later
+ # "plantuml -license" says GPLv3 or later
license = licenses.gpl3Plus;
- maintainers = [ maintainers.bjornfor ];
+ maintainers = with maintainers; [ bjornfor ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index dd0fb4de702e..fe31d324087c 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
buildPythonApplication rec {
pname = "tmuxp";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7";
+ sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm";
};
postPatch = ''
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7e79614c04ca..8cc224f475b1 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "youtube-dl";
- version = "2018.09.18";
+ version = "2018.09.26";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb";
+ sha256 = "0b26cnzdzai82d2bsy91jy1aas8m8psakdrs789xy0v4kwwgrk3n";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 9c8f8d31c0cc..c65c59265b56 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babeld-1.8.2";
+ name = "babeld-1.8.3";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
- sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87";
+ sha256 = "1gb6fcvi1cyl05sr9zhhasqlcbi927sbc2dns1jbnyz029lcb31n";
};
preBuild = ''
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d42cdcd4a347..dda97d34d869 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
assert gssSupport -> kerberos != null;
stdenv.mkDerivation rec {
- name = "curl-7.61.0";
+ name = "curl-7.61.1";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${name}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
];
- sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz";
+ sha256 = "1f8rljpa98g7ry7qyvv6657cmvgrwmam9mdbjklv45lspiykf253";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index a03d2a123932..fa025a2ec89e 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ udev ];
+ buildInputs = [
+ udev
+ runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
+ ];
preConfigure = "patchShebangs ./configure";
@@ -29,11 +32,6 @@ stdenv.mkDerivation rec {
# Check that the udev plugin got built.
postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
- # TODO shlevy remove once patchShebangs is fixed
- postFixup = ''
- find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'
- '';
-
meta = with stdenv.lib; {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
homepage = https://roy.marples.name/projects/dhcpcd;
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 8f72976d7dce..381489cc4360 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
- version = "1.8.13";
+ version = "1.8.14";
name = "${pname}-${version}";
src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
- sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1";
+ sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi";
};
buildInputs = [ openssl zlib ]
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 3920405fe4d1..9ecf69637872 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "i2pd";
- version = "2.20.0";
+ version = "2.21.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf";
+ sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 66a306ffb66c..d911acc58f4d 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
, withGnome ? true, gnome3, kmod }:
let
pname = "NetworkManager-openvpn";
- version = "1.8.4";
+ version = "1.8.6";
in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr";
+ sha256 = "1ksij9438f2lrwkg287qjlfaxja6jgmqxqap96585r3nf5zj69ch";
};
patches = [
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ openvpn networkmanager ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
- nativeBuildInputs = [ intltool pkgconfig libxml2 ];
+ nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
configureFlags = [
"--without-libnm-glib"
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index a0bac7854c1d..676f1d048554 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -31,13 +31,13 @@ let
in buildPythonApplication rec {
name = "pykms-${version}";
- version = "20171224";
+ version = "20180208";
src = fetchFromGitHub {
owner = "ThunderEX";
repo = "py-kms";
- rev = "885f67904f002042d7758e38f9c5426461c5cdc7";
- sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha";
+ rev = "a1666a0ee5b404569a234afd05b164accc9a8845";
+ sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4";
};
propagatedBuildInputs = [ argparse pytz ];
@@ -61,8 +61,8 @@ in buildPythonApplication rec {
mv * $siteDir
for b in client server ; do
- chmod 0755 $siteDir/$b.py
makeWrapper ${python.interpreter} $out/bin/$b.py \
+ --argv0 $b \
--add-flags $siteDir/$b.py
done
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index f8004ad0068d..8e9a88ad6f94 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -1,19 +1,29 @@
-{ stdenv, fetchFromGitHub, makeWrapper, bash, gawk, curl, netcat, ncurses }:
+{ stdenv
+, bash
+, curl
+, fetchFromGitHub
+, gawk
+, host
+, lib
+, makeWrapper
+, ncurses
+, netcat
+}:
stdenv.mkDerivation rec {
name = "twa-${version}";
- version = "1.3.1";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "trailofbits";
repo = "twa";
rev = version;
- sha256 = "16x9nzsrf10waqmjm423vx44820c6mls7gxc8azrdqnz18vdy1h4";
+ sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7";
};
dontBuild = true;
- buildInputs = [ makeWrapper bash gawk curl netcat ];
+ buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ];
installPhase = ''
install -Dm 0755 twa "$out/bin/twa"
@@ -22,13 +32,14 @@ stdenv.mkDerivation rec {
install -Dm 0644 README.md "$out/share/doc/twa/README.md"
wrapProgram "$out/bin/twa" \
- --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]}
'';
- meta = {
+ meta = with lib; {
description = "A tiny web auditor with strong opinions";
homepage = https://github.com/trailofbits/twa;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ avaq ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ avaq ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 3f1949d4bb68..493f52bd11b1 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
- version = "0.0.20180918";
+ version = "0.0.20180925";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
- sha256 = "0ax6wvapzmn52l7js6n416852npgapa9875yl2ixs271y8m9kv40";
+ sha256 = "10k63ld0f5q5aykpcrg9m3xmrsf3qmlkvhiv18q73hnky2cjfx62";
};
sourceRoot = "source/src/tools";
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 71c5bd53909f..975d36ddf190 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
}) // { perl-bindings = nix1; };
nixStable = (common rec {
- name = "nix-2.1.2";
+ name = "nix-2.1.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "68e55382dac9e66f84ead69b3c786a4ea85d4a6611a7a740aa0b78fcc85db3ec";
+ sha256 = "5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4";
};
}) // { perl-bindings = perl-bindings {
nix = nixStable;
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix
index 49770813b2b6..ca7793281ef9 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -1,12 +1,13 @@
{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }:
-stdenv.mkDerivation {
- name = "gen-oath-safe-2017-01-23";
+stdenv.mkDerivation rec {
+ name = "gen-oath-safe-${version}";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "mcepl";
repo = "gen-oath-safe";
- rev = "fb53841";
- sha256 = "0018kqmhg0861r5xkbis2a1rx49gyn0dxcyj05wap5ms7zz69m0m";
+ rev = version;
+ sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
new file mode 100644
index 000000000000..5731f3ef8bb6
--- /dev/null
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub , pkgconfig
+, pcsclite
+, autoreconfHook
+, libnfc
+}:
+
+stdenv.mkDerivation rec {
+ name = "ifdnfc-${version}";
+ version = "2016-03-01";
+
+ src = fetchFromGitHub {
+ owner = "nfc-tools";
+ repo = "ifdnfc";
+ rev = "0e48e8e";
+ sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg";
+ };
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ pcsclite libnfc ];
+
+ configureFlags = [ "--prefix=$(out)" ];
+ makeFlags = [ "DESTDIR=/" "usbdropdir=$(out)/pcsc/drivers" ];
+
+ meta = with stdenv.lib; {
+ description = "PC/SC IFD Handler based on libnfc";
+ longDescription =
+ '' libnfc Interface Plugin to be used in services.pcscd.plugins.
+ It provides support for all readers which are not supported by ccid but by libnfc.
+
+ For activating your reader you need to run
+ ifdnfc-activate yes with this package in your
+ environment.systemPackages
+
+ To use your reader you may need to blacklist your reader kernel modules:
+ boot.blacklistedKernelModules = [ "pn533" "pn533_usb" "nfc" ];
+
+ Supports the pn533 smart-card reader chip which is for example used in
+ the SCM SCL3711.
+ '';
+ homepage = https://github.com/nfc-tools/ifdnfc;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ makefu ];
+ };
+}
+
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 22d7e93fe476..27f2ca04d710 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, which }:
stdenv.mkDerivation rec {
- version = "2018-02-05";
+ version = "1.3.6";
name = "rhash-${version}";
src = fetchFromGitHub {
owner = "rhash";
repo = "RHash";
- rev = "cc26d54ff5df0f692907a5e3132a5eeca559ed61";
- sha256 = "1ldagp931lmxxpyvsb9rrar4iqwmv94m6lfjzkbkshpmk3p5ng7h";
+ rev = "v${version}";
+ sha256 = "1c8gngjj34ylx1f56hjbvml22bif0bx1b88dx2cyxbix8praxqh7";
};
nativeBuildInputs = [ which ];
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 4a4b790181d5..ec5eea52a6f8 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "softhsm-${version}";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchurl {
url = "https://dist.opendnssec.org/source/${name}.tar.gz";
- sha256 = "01ysfmq0pzr3g9laq40xwq8vg8w135d4m8n05mr1bkdavqmw3ai6";
+ sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj";
};
configureFlags = [
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 338afb7b3e17..d7344884951c 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "geoip" ];
- enableParallelBuilding = true;
-
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libevent openssl zlib ] ++
stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
@@ -37,14 +35,17 @@ stdenv.mkDerivation rec {
--replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
'';
+ enableParallelBuilding = true;
+ enableParallelChecking = false; # 4 tests fail randomly
+
+ doCheck = true;
+
postInstall = ''
mkdir -p $geoip/share/tor
mv $out/share/tor/geoip{,6} $geoip/share/tor
rm -rf $out/share/tor
'';
- doCheck = true;
-
passthru.updateScript = import ./update.nix {
inherit (stdenv) lib;
inherit
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 56b7b26c7bd4..3734fefe60a2 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "bfs-${version}";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
+ sha256 = "0nxx2njjp04ik6msfmf07hprw0j88wg04m0q1sf17mhkliw2d78s";
};
postPatch = ''
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 066848ea7be9..af934b54185a 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.56";
+ version = "21.57";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = "${version}";
- sha256 = "09zc8k1d9l673bb41vjpz3zrzaxaymqgk8m1v7pccvg70rq005kv";
+ sha256 = "1zxc26bljhj04mqzpwnqd6zfnz4dd2syapzn8xcakj882v4a8gnz";
};
patchPhase = ''
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index cd6577694890..a578f9db97a6 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
baseName = "ipmiutil";
- version = "3.1.2";
+ version = "3.1.3";
name = "${baseName}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
- sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n";
+ sha256 = "0mxydn6pwdhky659rz6k1jlh95hy43pmz4nx53kligjwy2v060xq";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 054de73c080f..0b4a33e43853 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
- "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so.390.67"
+ "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so"
"-DCMAKE_BUILD_TYPE=Release"
];
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index a8670203775a..818c76712c7e 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "thermald-${version}";
- version = "1.7.2";
+ version = "1.8";
src = fetchFromGitHub {
owner = "01org";
repo = "thermal_daemon";
rev = "v${version}";
- sha256 = "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc";
+ sha256 = "1g1l7k8yxj8bl1ysdx8v6anv1s7xk9j072y44gwki70dy48n7j92";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index b31d4cf93e64..1dec03e985b3 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, python27Packages }:
python27Packages.buildPythonApplication rec {
- version = "2.28.0";
+ version = "3.0.0";
name = "fanficfare-${version}";
nameprefix = "";
src = fetchurl {
url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
- sha256 = "18icxs9yaazz9swa2g4ppjsdbl25v22fdv4c1c3xspj3hwksjlvw";
+ sha256 = "0m8p1nn4621fspcas4g4k8y6fnnlzn7kxjxw2fapdrk3cz1pgi69";
};
propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 42ba36adf310..7e784b917b42 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "LanguageTool-${version}";
- version = "4.2";
+ version = "4.3";
src = fetchzip {
url = "https://www.languagetool.org/download/${name}.zip";
- sha256 = "01iy3cq6rwkm8sflj2nwp4ib29hyykd23hfsnrmqxji9csj8pf71";
+ sha256 = "0zsz82jc39j5wjwynmjny7h82kjz7clyk37n6pxmi85ibbdm0zn4";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 53fac978ebb0..73d8b6d0edb6 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -2,7 +2,7 @@
, texlive
, zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
-, perl, pkgconfig
+, perl, pkgconfig, autoreconfHook
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, cairo, pixman, xorg, clisp, biber
, makeWrapper
@@ -32,7 +32,15 @@ let
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin;
sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w";
})
+ (fetchurl {
+ name = "synctex-missing-header.patch";
+ url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/synctex-missing-header.patch?h=packages/texlive-bin&id=da56abf0f8a1e85daca0ec0f031b8fa268519e6b;
+ sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
+ })
];
+ # remove when removing synctex-missing-header.patch
+ preAutoreconf = "pushd texk/web2c";
+ postAutoreconf = "popd";
configureFlags = [
"--with-banner-add=/NixOS.org"
@@ -64,11 +72,11 @@ texliveYear = year;
core = stdenv.mkDerivation rec {
name = "texlive-bin-${version}";
- inherit (common) src patches;
+ inherit (common) src patches preAutoreconf postAutoreconf;
outputs = [ "out" "doc" ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
/*teckit*/ zziplib poppler mpfr gmp
pixman potrace gd freetype libpng libpaper zlib
@@ -101,7 +109,6 @@ core = stdenv.mkDerivation rec {
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure
-
;
enableParallelBuilding = true;
@@ -165,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex
name = "texlive-core-big.bin-${version}";
- inherit (common) src patches;
+ inherit (common) src patches preAutoreconf postAutoreconf;
hardeningDisable = [ "format" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33a2b6455a23..77c4e3972bef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1460,6 +1460,10 @@ with pkgs;
metabase = callPackage ../servers/metabase { };
+ mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
+
+ mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
+
monetdb = callPackage ../servers/sql/monetdb { };
mp3blaster = callPackage ../applications/audio/mp3blaster { };
@@ -2788,7 +2792,6 @@ with pkgs;
gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
- gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { };
gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
@@ -4623,6 +4626,7 @@ with pkgs;
pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
+ ifdnfc = callPackage ../tools/security/ifdnfc { };
pdd = python3Packages.callPackage ../tools/misc/pdd { };
@@ -5733,6 +5737,8 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7
};
+ uftrace = callPackage ../development/tools/uftrace { };
+
uget = callPackage ../tools/networking/uget { };
uget-integrator = callPackage ../tools/networking/uget-integrator { };
@@ -6445,7 +6451,14 @@ with pkgs;
'';
});
- crystal = callPackage ../development/compilers/crystal { };
+ inherit (callPackages ../development/compilers/crystal {})
+ crystal_0_25
+ crystal_0_26
+ crystal;
+
+ icr = callPackage ../development/tools/icr {};
+
+ scry = callPackage ../development/tools/scry {};
devpi-client = callPackage ../development/tools/devpi-client {};
@@ -6748,7 +6761,8 @@ with pkgs;
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
- gcc-arm-embedded = gcc-arm-embedded-6;
+ gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {};
+ gcc-arm-embedded = gcc-arm-embedded-7;
gforth = callPackage ../development/compilers/gforth {};
@@ -8044,6 +8058,8 @@ with pkgs;
buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; };
};
+ bazel-watcher = callPackage ../development/tools/bazel-watcher { };
+
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
bear = callPackage ../development/tools/build-managers/bear { };
@@ -8587,6 +8603,11 @@ with pkgs;
gconf = pkgs.gnome2.GConf;
};
+ nwjs-sdk = callPackage ../development/tools/nwjs {
+ gconf = pkgs.gnome2.GConf;
+ sdk = true;
+ };
+
# only kept for nixui, see https://github.com/matejc/nixui/issues/27
nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
gconf = pkgs.gnome2.GConf;
@@ -8859,7 +8880,6 @@ with pkgs;
valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (darwin) xnu bootstrap_cmds cctools;
- llvm = llvm_39;
};
valgrind-light = self.valgrind.override { gdb = null; };
@@ -10236,7 +10256,9 @@ with pkgs;
inherit (xorg) libX11 libXext;
};
- libcanberra = callPackage ../development/libraries/libcanberra { };
+ libcanberra = callPackage ../development/libraries/libcanberra {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
libcanberra-gtk3 = pkgs.libcanberra.override {
gtk = gtk3;
};
@@ -10729,6 +10751,8 @@ with pkgs;
libiec61883 = callPackage ../development/libraries/libiec61883 { };
+ libimagequant = callPackage ../development/libraries/libimagequant {};
+
libinfinity = callPackage ../development/libraries/libinfinity { };
libinput = callPackage ../development/libraries/libinput {
@@ -11226,37 +11250,32 @@ with pkgs;
## libGL/libGLU/Mesa stuff
# Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
- libGL = libGLDarwinOr mesa_noglu.stubs;
+ libGL = mesa_noglu.stubs;
# Default libGLU
- libGLU = libGLDarwinOr mesa_glu;
+ libGLU = mesa_glu;
# Combined derivation, contains both libGL and libGLU
# Please, avoid using this attribute. It was meant as transitional hack
# for packages that assume that libGLU and libGL live in the same prefix.
# libGLU_combined propagates both libGL and libGLU
- libGLU_combined = libGLDarwinOr (buildEnv {
+ libGLU_combined = buildEnv {
name = "libGLU-combined";
paths = [ libGL libGLU ];
extraOutputsToInstall = [ "dev" ];
- });
+ };
# Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need)
- libGL_driver = libGLDarwinOr mesa_drivers;
+ libGL_driver = mesa_drivers;
libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
- libGLDarwin = callPackage ../development/libraries/mesa-darwin {
- inherit (darwin.apple_sdk.frameworks) OpenGL;
- inherit (darwin.apple_sdk.libs) Xplugin;
- inherit (darwin) apple_sdk;
- };
-
- libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative;
-
mesa_noglu = callPackage ../development/libraries/mesa {
llvmPackages = llvmPackages_6;
+ inherit (darwin.apple_sdk.frameworks) OpenGL;
+ inherit (darwin.apple_sdk.libs) Xplugin;
};
+ mesa = mesa_noglu;
mesa_glu = callPackage ../development/libraries/mesa-glu { };
@@ -14375,6 +14394,9 @@ with pkgs;
linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest);
linux_latest_hardened = linuxPackages_latest_hardened.kernel;
+ linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing);
+ linux_testing_hardened = linuxPackages_testing_hardened.kernel;
+
linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));
linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
@@ -15055,6 +15077,8 @@ with pkgs;
hanazono = callPackage ../data/fonts/hanazono { };
+ hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { };
+
ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
ibm-plex = callPackage ../data/fonts/ibm-plex { };
@@ -16409,6 +16433,14 @@ with pkgs;
flink = callPackage ../applications/networking/cluster/flink { };
flink_1_5 = flink.override { version = "1.5"; };
+ fllog = callPackage ../applications/misc/fllog { };
+
+ flmsg = callPackage ../applications/misc/flmsg { };
+
+ flrig = callPackage ../applications/misc/flrig { };
+
+ flwrap = callPackage ../applications/misc/flwrap { };
+
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
};
@@ -17071,6 +17103,8 @@ with pkgs;
i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
+ wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
+
i810switch = callPackage ../os-specific/linux/i810switch { };
icewm = callPackage ../applications/window-managers/icewm {};
@@ -19759,6 +19793,8 @@ with pkgs;
zim = callPackage ../applications/office/zim { };
+ zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
+
zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { };
@@ -21713,7 +21749,9 @@ with pkgs;
hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; };
- hyperfine = callPackage ../tools/misc/hyperfine { };
+ hyperfine = callPackage ../tools/misc/hyperfine {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
epkowa = callPackage ../misc/drivers/epkowa { };
@@ -22043,9 +22081,10 @@ with pkgs;
mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
- samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
+ samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
+ samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
- samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
+ samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17;
sane-backends = callPackage ../applications/graphics/sane/backends {
gt68xxFirmware = config.sane.gt68xxFirmware or null;
@@ -22109,6 +22148,8 @@ with pkgs;
steamcontroller = callPackage ../misc/drivers/steamcontroller { };
+ stern = callPackage ../applications/networking/cluster/stern { };
+
streamripper = callPackage ../applications/audio/streamripper { };
sqsh = callPackage ../development/tools/sqsh { };
@@ -22121,6 +22162,7 @@ with pkgs;
terraform_0_10-full
terraform_0_11
terraform_0_11-full
+ terraform_plugins_test
;
terraform = terraform_0_11;
@@ -22130,11 +22172,6 @@ with pkgs;
callPackage ../applications/networking/cluster/terraform-providers {}
);
- terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
-
- terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {};
-
-
terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
@@ -22151,6 +22188,8 @@ with pkgs;
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
+ tetra-gtk-theme = callPackage ../misc/themes/tetra { };
+
tewi-font = callPackage ../data/fonts/tewi {};
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
@@ -22524,4 +22563,6 @@ with pkgs;
alibuild = callPackage ../development/tools/build-managers/alibuild {
python = python27;
};
+
+ tsung = callPackage ../applications/networking/tsung {};
}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index b0c82508c114..3bf7c31b7008 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -31,10 +31,7 @@ in
libcxxabi = pkgs.libcxxabi;
};
- cf-private = callPackage ../os-specific/darwin/cf-private {
- inherit (apple-source-releases) CF;
- inherit (darwin) osx_private_sdk;
- };
+ cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; };
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
@@ -76,7 +73,10 @@ in
CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
- swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { };
+ CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
+
+ # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
+ # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };
darling = callPackage ../os-specific/darwin/darling/default.nix { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a86031d5ce7c..56a59b04b5b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -165,10 +165,10 @@ let
};
AnyEventHTTP = buildPerlPackage rec {
- name = "AnyEvent-HTTP-2.23";
+ name = "AnyEvent-HTTP-2.24";
src = fetchurl {
url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
- sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb";
+ sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd";
};
propagatedBuildInputs = [ AnyEvent commonsense ];
};
@@ -501,10 +501,10 @@ let
};
ArchiveTar = buildPerlPackage rec {
- name = "Archive-Tar-2.30";
+ name = "Archive-Tar-2.32";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
- sha256 = "4a5a172cfefe08cb2d32f99ed388a3b55967588bbf254e950bc8a48a8bf1d2e5";
+ sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2";
};
meta = {
description = "Manipulates TAR archives";
@@ -526,10 +526,10 @@ let
};
ArchiveZip = buildPerlPackage {
- name = "Archive-Zip-1.62";
+ name = "Archive-Zip-1.64";
src = fetchurl {
- url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.62.tar.gz;
- sha256 = "1jax173w7nm5r6k7ymfcskvs1rw590lyscbqrnfbkjj4cxc65wrb";
+ url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz;
+ sha256 = "0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy";
};
buildInputs = [ TestMockModule ];
meta = {
@@ -811,10 +811,10 @@ let
};
BKeywords = buildPerlPackage rec {
- name = "B-Keywords-1.18";
+ name = "B-Keywords-1.19";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
- sha256 = "0f5bb2fpbq5jzdb2jfs73hrggrq2gnpacd2kkxgifjl7q7xd9ck5";
+ sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9";
};
meta = {
description = "Lists of reserved barewords and symbol names";
@@ -1082,10 +1082,10 @@ let
};
Carp = buildPerlPackage rec {
- name = "Carp-1.38";
+ name = "Carp-1.50";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
- sha256 = "00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5";
+ url = mirror://cpan/authors/id/X/XS/XSAWYERX/Carp-1.50.tar.gz;
+ sha256 = "1ngbpjyd9qi7n4h5r3q3qibd8by7rfiv7364jqlv4lbd3973n9zm";
};
meta = with stdenv.lib; {
description = "Alternative warn and die for modules";
@@ -2347,10 +2347,10 @@ let
};
CodeTidyAll = buildPerlPackage rec {
- name = "Code-TidyAll-0.70";
+ name = "Code-TidyAll-0.71";
src = fetchurl {
- url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.70.tar.gz;
- sha256 = "16s847y7jhx07yn15p84lpr1jn8srqb8ma12g4ngwr46hhkrbz06";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.71.tar.gz;
+ sha256 = "043s0fkg8y9g38m9p87jh9p1kkznz7yq96x2rnjj221hpl3zysdr";
};
propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];
@@ -2519,10 +2519,10 @@ let
};
ConfigIniFiles = buildPerlModule rec {
- name = "Config-IniFiles-2.98";
+ name = "Config-IniFiles-3.000000";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
- sha256 = "9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797";
+ sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29";
};
propagatedBuildInputs = [ IOStringy ];
meta = {
@@ -2771,10 +2771,10 @@ let
};
CpanelJSONXS = buildPerlPackage rec {
- name = "Cpanel-JSON-XS-4.05";
+ name = "Cpanel-JSON-XS-4.06";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
- sha256 = "dd2b69265604ac6f18b47131565f712d55ed8df3b85f8f58f0c98cad17383663";
+ sha256 = "63481d9d2d6251cf520bb6a62147faf6e8f35b9fe6b3ddd81c5bfd71e31ec9ba";
};
meta = {
description = "CPanel fork of JSON::XS, fast and correct serializing";
@@ -2954,10 +2954,10 @@ let
};
CryptJWT = buildPerlPackage rec {
- name = "Crypt-JWT-0.022";
+ name = "Crypt-JWT-0.023";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
- sha256 = "eb0a591f91c431929d8788dc26cc8cd98d1dc37af2a45b5754ca5039c8282476";
+ sha256 = "540594d0051028e00e586eb7827df09b01c091c648bb6b210de3124fe118524b";
};
propagatedBuildInputs = [ CryptX JSONMaybeXS ];
meta = {
@@ -3249,10 +3249,10 @@ let
};
DataDumper = buildPerlPackage rec {
- name = "Data-Dumper-2.161";
+ name = "Data-Dumper-2.172";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz";
- sha256 = "3aa4ac1b042b3880438165fb2b2139d377564a8e9928ffe689ede5304ee90558";
+ url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.172.tar.gz;
+ sha256 = "a95a3037163817221021ac145500968be44dc155c261f4097136392c0a9fecd9";
};
outputs = [ "out" ];
meta = {
@@ -3614,10 +3614,10 @@ let
};
DateManip = buildPerlPackage rec {
- name = "Date-Manip-6.72";
+ name = "Date-Manip-6.73";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz";
- sha256 = "19jdm73kqbv1biw4v8bdzy5qr2xvqdrfz8lxgg59445ljjfxvx1q";
+ sha256 = "0md25ik7pwbwgidiprcq20db8jdniknxs0qj1m3l76ziqg3rb4nk";
};
# for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work
patchPhase = ''
@@ -3717,10 +3717,10 @@ let
};
DateTimeFormatFlexible = buildPerlPackage {
- name = "DateTime-Format-Flexible-0.30";
+ name = "DateTime-Format-Flexible-0.31";
src = fetchurl {
- url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.30.tar.gz;
- sha256 = "e7974e0492d7801682b400dd8e9a6fbfd8a56602942883cd7867a2008734cca4";
+ url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.31.tar.gz;
+ sha256 = "0daf62fe4af0b336d45e367143a580b5a34912a679eef788d54c4d5ad685c2d1";
};
propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ];
meta = {
@@ -4009,10 +4009,10 @@ let
};
DevelPPPort = buildPerlPackage rec {
- name = "Devel-PPPort-3.42";
+ name = "Devel-PPPort-3.43";
src = fetchurl {
- url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.42.tar.gz;
- sha256 = "bac5d98b92fe2673a84ea45f1c9b615e3a46c3cc6db59c61a2fc95dd3cf9e14a";
+ url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz;
+ sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4";
};
meta = {
description = "Perl/Pollution/Portability";
@@ -5976,10 +5976,10 @@ let
};
FilePath = buildPerlPackage rec {
- name = "File-Path-2.15";
+ name = "File-Path-2.16";
src = fetchurl {
- url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.15.tar.gz;
- sha256 = "1570f3c1cdf93c50f65c2072e8f20ee121550771dfb7f6e563f503a2a7050744";
+ url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz;
+ sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05";
};
meta = {
description = "Create or remove directory trees";
@@ -6297,10 +6297,10 @@ let
};
ForksSuper = buildPerlPackage {
- name = "Forks-Super-0.94";
+ name = "Forks-Super-0.96";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.94.tar.gz;
- sha256 = "145nj2wsymr5vr93ikrakjx3dd07q63fxb1bq7lkiranm9974v8s";
+ url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.96.tar.gz;
+ sha256 = "0vzxfxdgxjk83cwg9p5dzvfydrah53xcxkickznrrd5rhp1rasqx";
};
doCheck = false;
meta = {
@@ -6349,10 +6349,10 @@ let
};
GD = buildPerlPackage rec {
- name = "GD-2.68";
+ name = "GD-2.69";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.68.tar.gz;
- sha256 = "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va";
+ url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz;
+ sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x";
};
buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ];
@@ -7760,12 +7760,12 @@ let
};
IOSocketSSL = buildPerlPackage rec {
- name = "IO-Socket-SSL-2.059";
+ name = "IO-Socket-SSL-2.060";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
- sha256 = "217debbe0a79f0b7c5669978b4d733271998df4497f4718f78456e5f54d64849";
+ sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c";
};
- propagatedBuildInputs = [ NetSSLeay ];
+ propagatedBuildInputs = [ MozillaCA NetSSLeay ];
# Fix path to default certificate store.
postPatch = ''
substituteInPlace lib/IO/Socket/SSL.pm \
@@ -8320,10 +8320,10 @@ let
};
LinguaENTagger = buildPerlPackage {
- name = "Lingua-EN-Tagger-0.29";
+ name = "Lingua-EN-Tagger-0.30";
src = fetchurl {
- url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.29.tar.gz;
- sha256 = "0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na";
+ url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.30.tar.gz;
+ sha256 = "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b";
};
propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ];
meta = {
@@ -8566,10 +8566,10 @@ let
};
LocaleCodes = buildPerlPackage {
- name = "Locale-Codes-3.57";
+ name = "Locale-Codes-3.58";
src = fetchurl {
- url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.57.tar.gz;
- sha256 = "3547cffeb6098a706a5647f6079e06cbdb68a6b7f9c8d5b0032659df7bfd8812";
+ url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.58.tar.gz;
+ sha256 = "345c0b0170288d74a147fbe218b7c78147aa2baf4e839fe8680a2b0a2d8e505b";
};
meta = {
description = "A distribution of modules to handle locale codes";
@@ -8782,10 +8782,10 @@ let
};
LogDispatch = buildPerlPackage {
- name = "Log-Dispatch-2.67";
+ name = "Log-Dispatch-2.68";
src = fetchurl {
- url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz;
- sha256 = "017ks3i0k005dqz7fz53w7x35csqqlr4vfb95c0ijdablajs4kd9";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.68.tar.gz;
+ sha256 = "1bxd3bhrn1h2q9f8r65z3101a32nl2kdb7l40bxg4vbsk4wk0ynh";
};
propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ];
meta = {
@@ -8844,10 +8844,10 @@ let
};
MCE = buildPerlPackage rec {
- name = "MCE-1.836";
+ name = "MCE-1.837";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.836.tar.gz;
- sha256 = "04nkcbs27plwq31w541phfci3391s10p2xv5lmry5wq7fbdw5iwy";
+ url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz;
+ sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa";
};
meta = {
description = "Many-Core Engine for Perl providing parallel processing capabilities";
@@ -8973,7 +8973,7 @@ let
sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j";
};
patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
- propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ];
+ propagatedBuildInputs = [ IOSocketSSL LWP ];
doCheck = false; # tries to connect to https://www.apache.org/.
meta = {
description = "Provide https support for LWP::UserAgent";
@@ -9092,10 +9092,10 @@ let
};
MailMessage = buildPerlPackage rec {
- name = "Mail-Message-3.006";
+ name = "Mail-Message-3.007";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.006.tar.gz;
- sha256 = "08bdf06bmxdqbslk3k9av542pjhyw9wx10j79fxz0dwpalimc6zi";
+ url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz;
+ sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn";
};
propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ];
meta = {
@@ -9200,10 +9200,10 @@ let
};
MailTransport = buildPerlPackage rec {
- name = "Mail-Transport-3.002";
+ name = "Mail-Transport-3.003";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.002.tar.gz;
- sha256 = "0wm4j9w15nsvjxi9x22fn2rnljbffd88v27p0z0305bfg35gh4kg";
+ url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.003.tar.gz;
+ sha256 = "0lb1awpk2wcnn5wg663982jl45x9fdn8ikxscayscxa16rim116p";
};
propagatedBuildInputs = [ MailMessage ];
meta = {
@@ -9567,11 +9567,11 @@ let
};
ModernPerl = buildPerlModule {
- name = "Modern-Perl-1.20180701";
+ name = "Modern-Perl-1.20180901";
src = fetchurl {
- url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180701.tar.gz;
- sha256 = "cfdf390bc565599ef90ef086a81233dc1dfc7867676dc28e1deedcd7e5543da6";
+ url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180901.tar.gz;
+ sha256 = "5c289bbe59cfc90abb9b8c6b9903b7625ca9ea26239d397d87f7b57517cd61a1";
};
meta = {
homepage = https://github.com/chromatic/Modern-Perl;
@@ -9940,10 +9940,10 @@ let
};
ModuleSignature = buildPerlPackage {
- name = "Module-Signature-0.81";
+ name = "Module-Signature-0.83";
src = fetchurl {
- url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.81.tar.gz;
- sha256 = "7df547ceb8e45d40f75e481a868f389aaed5641c2cf4e133146ccea4b8facec6";
+ url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz;
+ sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb";
};
buildInputs = [ IPCRun ];
meta = {
@@ -10005,10 +10005,10 @@ let
};
Mojolicious = buildPerlPackage rec {
- name = "Mojolicious-8.0";
+ name = "Mojolicious-8.01";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
- sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
+ sha256 = "1gwf45s6vblff0ima2awjq3awj4wws4hn7df4d9jmyj9rji04z9c";
};
buildInputs = [ ExtUtilsMakeMaker ];
propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];
@@ -10020,11 +10020,26 @@ let
};
};
+ MojoliciousPluginStatus = buildPerlPackage rec {
+ name = "Mojolicious-Plugin-Status-1.0";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
+ sha256 = "14ypg679dk9yvgq67mp7lzs131cxhbgcmrpx5f4ddqcrs1bzq5rb";
+ };
+ propagatedBuildInputs = [ Mojolicious IPCShareLite BSDResource Sereal ];
+ meta = {
+ homepage = https://github.com/mojolicious/mojo-status;
+ description = "Mojolicious server status plugin";
+ license = with stdenv.lib.licenses; [ artistic2 ];
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
MojoIOLoopForkCall = buildPerlModule rec {
name = "Mojo-IOLoop-ForkCall-0.20";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
- sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b";
+ sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6";
};
propagatedBuildInputs = [ IOPipely Mojolicious ];
meta = {
@@ -11086,13 +11101,13 @@ let
};
NetAmazonS3 = buildPerlPackage rec {
- name = "Net-Amazon-S3-0.84";
+ name = "Net-Amazon-S3-0.85";
src = fetchurl {
- url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.84.tar.gz;
- sha256 = "9e995f7d7982d4ab3510bf30e842426b341be20e4b7e6fe48edafeb067f49626";
+ url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.85.tar.gz;
+ sha256 = "49b91233b9e994ce3536dd69c5106c968a03d199ff3968c8fc2f2b5be3d55430";
};
- buildInputs = [ TestDeep TestException ];
- propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon TermEncoding TermProgressBarSimple XMLLibXML ];
+ buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ];
+ propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ];
meta = {
description = "Use the Amazon S3 - Simple Storage Service";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -12026,13 +12041,13 @@ let
};
PathTools = buildPerlPackage {
- name = "PathTools-3.74";
+ name = "PathTools-3.75";
preConfigure = ''
substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd'
'';
src = fetchurl {
- url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.74.tar.gz;
- sha256 = "25724cc54c59a3bfabadec95e72db292c98676bf3632497384e8dc6277936e11";
+ url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz;
+ sha256 = "a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2";
};
};
@@ -12071,10 +12086,10 @@ let
};
Pegex = buildPerlPackage rec {
- name = "Pegex-0.64";
+ name = "Pegex-0.67";
src = fetchurl {
url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
- sha256 = "27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd";
+ sha256 = "3cb9df73aece2a5fa769a89bd74daaac302cc077e2489b3b552f3aa172092091";
};
buildInputs = [ FileShareDirInstall YAMLLibYAML ];
meta = {
@@ -12259,10 +12274,10 @@ let
};
PkgConfig = buildPerlPackage rec {
- name = "PkgConfig-0.21026";
+ name = "PkgConfig-0.22026";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
- sha256 = "018f8d3c74e661df66046b26e57f4c5991adafe202af7ea2d1c6f6bcafde584b";
+ sha256 = "d01849bf88f3d56f4efe304cfe56f806867a45b716e3963dcacce17b829433ce";
};
meta = {
description = "Pure-Perl Core-Only replacement for pkg-config";
@@ -13400,10 +13415,10 @@ let
};
ScopeUpper = buildPerlPackage rec {
- name = "Scope-Upper-0.30";
+ name = "Scope-Upper-0.31";
src = fetchurl {
url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
- sha256 = "7f151582423850d814034404b1e23b5efb281b9dd656b9afe81c761ebb88bbb4";
+ sha256 = "cc4d2ce0f185b4867d73b4083991117052a523fd409debf15bdd7e374cc16d8c";
};
meta = {
description = "Act on upper scopes";
@@ -13423,6 +13438,55 @@ let
};
};
+ SerealDecoder = buildPerlPackage rec {
+ name = "Sereal-Decoder-4.005";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+ sha256 = "17syqbq17qw6ajg3w88q9ljdm4c2b7zadq9pwshxxgyijg8dlfh4";
+ };
+ buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+ propagatedBuildInputs = [ XSLoader ];
+ preBuild = ''ls'';
+ meta = {
+ homepage = https://github.com/Sereal/Sereal;
+ description = "Fast, compact, powerful binary deserialization";
+ license = with stdenv.lib.licenses; [ artistic2 ];
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
+ SerealEncoder = buildPerlPackage rec {
+ name = "Sereal-Encoder-4.005";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+ sha256 = "02hbk5dwq7fpnyb3vp7xxhb41ra48xhghl13p9pjq9lzsqlb6l19";
+ };
+ buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+ propagatedBuildInputs = [ XSLoader SerealDecoder ];
+ meta = {
+ homepage = https://github.com/Sereal/Sereal;
+ description = "Fast, compact, powerful binary deserialization";
+ license = with stdenv.lib.licenses; [ artistic2 ];
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
+ Sereal = buildPerlPackage rec {
+ name = "Sereal-4.005";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+ sha256 = "0lnczrf311pl9b2x75r0ffsszv5aspfb8x6jdvgr3rgqp7nbm1wr";
+ };
+ buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+ propagatedBuildInputs = [ SerealEncoder SerealDecoder ];
+ meta = {
+ homepage = https://github.com/Sereal/Sereal;
+ description = "Fast, compact, powerful binary deserialization";
+ license = with stdenv.lib.licenses; [ artistic2 ];
+ maintainers = [ maintainers.thoughtpolice ];
+ };
+ };
+
ServerStarter = buildPerlModule rec {
name = "Server-Starter-0.34";
src = fetchurl {
@@ -15332,6 +15396,19 @@ let
};
};
+ TestLoadAllModules = buildPerlPackage {
+ name = "Test-LoadAllModules-0.022";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz;
+ sha256 = "1zjwbqk1ns9m8srrhyj3i5zih976i4d2ibflh5s8lr10a1aiz1hv";
+ };
+ propagatedBuildInputs = [ ListMoreUtils ModulePluggable ];
+ meta = {
+ description = "do use_ok for modules in search path";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TestLongString = buildPerlPackage rec {
name = "Test-LongString-0.17";
src = fetchurl {
@@ -15385,10 +15462,10 @@ let
};
TestMockModule = buildPerlModule {
- name = "Test-MockModule-0.15";
+ name = "Test-MockModule-0.170.0";
src = fetchurl {
- url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz;
- sha256 = "0nx3nz7yvgcw9vw646520hh1jb3kz6sspsfqa69v3vczdkfgx5qn";
+ url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.170.0.tar.gz;
+ sha256 = "0pggwrlqj6k44qayhbpjqkzry1r626iy2vf30zlf2jdhbjbvlycz";
};
propagatedBuildInputs = [ SUPER ];
meta = {
@@ -15674,10 +15751,10 @@ let
};
TestRoutine = buildPerlPackage {
- name = "Test-Routine-0.025";
+ name = "Test-Routine-0.027";
src = fetchurl {
- url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.025.tar.gz;
- sha256 = "13gxczy0mx3rqnp55vc0j2d936qldrimmad87nmf4wrj0kd2lw92";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz;
+ sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s";
};
buildInputs = [ TestAbortable TestFatal ];
propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ];
@@ -17941,10 +18018,10 @@ let
};
YAMLLibYAML = buildPerlPackage rec {
- name = "YAML-LibYAML-0.72";
+ name = "YAML-LibYAML-0.74";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
- sha256 = "0dn50pranjyai4gclb501m29y0ks03y87g132wqpb469rb3sjd0g";
+ url = mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.74.tar.gz;
+ sha256 = "021l0gf6z93xd6vd604vpvb9d4b714zph17g6hg47fpawdq0xpd0";
};
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2da2892f9beb..8f04a0e710d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -250,6 +250,8 @@ in {
dependency-injector = callPackage ../development/python-modules/dependency-injector { };
+ btchip = callPackage ../development/python-modules/btchip { };
+
dbf = callPackage ../development/python-modules/dbf { };
dbfread = callPackage ../development/python-modules/dbfread { };
@@ -4295,6 +4297,8 @@ in {
schema = callPackage ../development/python-modules/schema {};
+ simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {};
+
stem = callPackage ../development/python-modules/stem { };
svg-path = callPackage ../development/python-modules/svg-path { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6ebc640ea219..93400bf0ee65 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -77,6 +77,7 @@ let
jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
+ jobs.tests.patch-shebangs.x86_64-darwin
];
} else null;
@@ -119,6 +120,7 @@ let
jobs.tests.cc-multilib-gcc.x86_64-linux
jobs.tests.cc-multilib-clang.x86_64-linux
jobs.tests.stdenv-inputs.x86_64-linux
+ jobs.tests.patch-shebangs.x86_64-linux
]
++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
++ lib.optionals supportDarwin [
@@ -148,6 +150,7 @@ let
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
+ jobs.tests.patch-shebangs.x86_64-darwin
];
};